Updated color scheme
Merge branch 'master' of https://github.com/Frozenfire92/SMU-Hack-A-Week-2014
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	css/style.css