merge .gitignore

.gitignore

@@ -1 +1,44 @@
 .vagrant
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Text Backup Files #
+*.s[a-w][a-z]
+*~
+\#*\#
+.\#*
+
+# OS X Files #
+.DS_Store
+._*
+.Spotlight*
+.Trashes
+
+# Windows Files #
+Thumbs.db
+ehthumbs.db
+
+a.out
+*.project
+*.class
+*.pyc

README.md

@@ -1,10 +1,8 @@
 #EasyCTF 2016
-The easyctf website for the 2016 competition.
+The EasyCTF website for the 2016 competition.
 
-###Color Scheme:
+**Back End** : Flask (Python)
 
-* #69D2E7
+**Front End** : Angular.js (JavaScript)
-* #A7DBDB
+
-* #E0E4CC
+Color Scheme: #69D2E7 | #A7DBDB | #E0E4CC | #F38630 | #FA6900
-* #F38630
-* #FA6900