Resolve all fuckups
Resolve all fuckups
Resolve all fuckups
Merge origin/master

Conflicts:
	app/index.html