merged master

2017-06-07 17:45:40 +06:30
parent 114c4ee14d 4323da6589
commit df138d94ba
25 changed files with 142 additions and 91 deletions
--- a/app/assets/stylesheets/orgiami.scss
+++ b/app/assets/stylesheets/orgiami.scss
@@ -61,3 +61,11 @@
 .purple {
 	background-color:#7a62d3;
 }
+
+.red {
+	background-color:#ff0000;
+}
+
+.green{
+	background-color: #009900
+}