Tidying up code

Just tidied the code up a bit so that I could read it better to try and
figure out what was wrong.
Merge branch 'master' of https://github.com/chrisvanwell/MyVarsityLife

Conflicts:
	index_test.html