[new] Finally fixed the front page color trash, added some stuff with the sidebar
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory

Conflicts:
	index.html