this weird stuff
Merge branch 'gh-pages' of https://github.com/jmayhew/wsd into gh-pages

Conflicts:
	CSS/main.css