From 8cc3cbc756daaadf2733e09caac313e187e9d827 Mon Sep 17 00:00:00 2001 From: James Wang Date: Mon, 21 Dec 2015 00:55:00 -0500 Subject: [PATCH 1/3] Add .gitignore --- .gitignore | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8facdfd --- /dev/null +++ b/.gitignore @@ -0,0 +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 From 0cf73c44e4831f6dfb1d840fd6d2cf2fa905be59 Mon Sep 17 00:00:00 2001 From: Thomas Gerot Date: Mon, 21 Dec 2015 00:13:36 -0600 Subject: [PATCH 2/3] Reformatted --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6a87b07..41381a9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ #EasyCTF 2016 The easyctf website for the 2016 competition. -###Color Scheme: +**Back End** : Flask (Python) -* #69D2E7 -* #A7DBDB -* #E0E4CC -* #F38630 -* #FA6900 +**Front End** : Angular.js (JavaScript) + +Color Scheme: #69D2E7 | #A7DBDB | #E0E4CC | #F38630 | #FA6900 From 6da92b984a3e4bbb4eb329d73eff9730a4b6bef2 Mon Sep 17 00:00:00 2001 From: Thomas Gerot Date: Mon, 21 Dec 2015 00:14:10 -0600 Subject: [PATCH 3/3] Updated name capitalization --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41381a9..0ee3fef 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #EasyCTF 2016 -The easyctf website for the 2016 competition. +The EasyCTF website for the 2016 competition. **Back End** : Flask (Python)