replaced files
Merge branch 'gh-pages' of https://github.com/justnicksc/wsd into gh-pages

Conflicts:
	css/main.css
	index.html