cool changes
Merge branch 'gh-pages' of https://github.com/kitatemus/new-site into gh-pages

Conflicts:
	index.html