springsplash site
Merge branch 'gh-pages' of https://github.com/williamibekwe/springsplash2013

Conflicts:
	index.html
Merge branch 'master' into gh-pages

Conflicts:
	index.html