merge angular branch

.gitignore

@@ -0,0 +1,13 @@
+logs
+*.log
+npm-debug.log*
+pids
+*.pid
+*.seed
+lib-cov
+coverage
+.grunt
+.lock-wscript
+build/Release
+node_modules
+**/.DS_Store

public/css/application.css

@@ -0,0 +1,122 @@
+@font-face {
+    font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
+}
+
+html {
+  height: 100%;
+}
+
+.aqdaBody .navbar{
+  background-color: white;
+}
+
+#results-container{
+  font-size: larger;
+  min-height: 300px;
+}
+
+.strainTable {
+  width: 100%;
+  margin-top: 50px;
+  text-align: center;
+}
+
+.strainTable a{
+  color: white;
+  text-align: center;
+}
+
+.strainTable a:hover{
+  color: grey;
+}
+
+.aqdaBody {
+    font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
+    background-color: rgb(38, 91, 162);
+    height: 100%;
+}
+
+.navbar .container { min-height: 83px; }
+
+
+.navbar-fixed-top {
+  position:static;
+  margin-bottom: 0px;
+}
+
+ul.navbar-nav a {
+  margin-top: 16px;
+}
+
+.top-block{
+  background-color: rgb(48, 112, 201);
+}
+
+.middle-block{
+  background-color: rgb(57, 130, 233);
+}
+
+.bottom-block{
+  background-color: rgb(38, 91, 162);
+}
+
+.btn-circle {
+  width: 100px;
+  height: 100px;
+  text-align: center;
+  padding: 6px 0;
+  font-size: 12px;
+  line-height: 1.42;
+  border-width: 3px;
+  border-radius: 50px;
+  background-color: transparent;
+}
+
+.btn-circle-selected {
+  background-color: rgb(38, 91, 162);;
+}
+
+
+.indicators {
+    text-align: center;
+}
+
+.indicator {
+    padding: 0px 5px;
+}
+
+.indicator button {
+    width: 20px;
+    height: 20px;
+    background: none;
+    border-color: #fff;
+    border-width: 2px;
+    border-style: solid;
+    border-radius: 10px;
+}
+
+.indicator button:hover {
+
+}
+
+.indicator.active button {
+    background-color: white;
+}
+
+.question-area {
+  color: white;
+}
+
+.question-form-control{
+
+  border-color: rgb(122, 170, 226);
+  border-width: 3px;
+  font-size: 30px;
+  height: auto;
+  color: white;
+  text-align: center;
+}
+
+.question-form-control-unselected{
+  background-color: transparent;
+}

public/css/quiz.css

@@ -1,5 +1,5 @@
 body {
-    background-color: #f80;
+    background-color: white; 
 }
 
 .emphasis {

public/css/style.css

@@ -1,6 +1,6 @@
 @font-face {
     font-family: museo-sans;
-    src: url(/fonts/MuseoSans_300.otf);
+    src: url(./fonts/MuseoSans_300.otf);
 }
 
 body {