Modified everything so that I'm comfortable creating content.
Merge branch 'gh-pages' of github.com:easoncxz/tifa into gh-pages

Oh amending a pushed commit - I shall not do this again...

Conflicts:
	list-of-entries/index.html