change
change
Merge branch 'gh-pages' of github_invictus:/invictussoul/invictus into gh-pages

Conflicts:
	2013-11-14-hello-world.html
	index.html