merge with august spring

app/assets/javascripts/application.js

@@ -21,6 +21,7 @@
 //= require jquery-ui
 //= require bootstrap-datepicker
 //= require jquery.datetimepicker
+//= require dataTables/jquery.dataTables
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({

app/assets/stylesheets/application.scss

@@ -5,6 +5,7 @@
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
 @import "jquery.datetimepicker";
+@import "dataTables/jquery.dataTables";
 
 /* Show it is fixed to the top */
 // body {

app/assets/stylesheets/settings.scss

@@ -60,4 +60,31 @@ ul.dropdown-menu li a{
 
  .padding-10 {
  	padding: 10px;
- }
+ }
+
+/* Colors */
+.purple {
+  background-color:#7a62d3;
+}
+
+.orange{
+  background-color:#FF7F50;
+}
+
+.red {
+  background-color:#ff0000;
+}
+
+.green{
+  background-color: #009900;
+}
+
+.orange{
+  background-color: #FF8C00;
+}
+
+.blue{
+  background-color: blue;
+}
+
+/* End Colors */