I think I'm about to have a merge conflict
Merge branch 'gh-pages' of https://github.com/nchandran3/Its-About-Time into gh-pages

Conflicts:
	index.html
Getting right index file