Merge pull request #10 from Frozenfire92/master

Merge master in
Test new color
Updated color
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	css/style.css