Basically, fixing everything that's wrong.
Merge branch 'master' of https://github.com/austinwalker/test

Conflicts:
	app/index.html