Update #432 by Henry: Clean up the master branch
Merge branch 'app' of github.com:henryoliver/StarWars-AT-AT-app

Conflicts:
	app/.DS_Store
	dist/images/5d462625.glyphicons-halflings-white.png
	dist/manifest.appcache
	dist/styles/2cb57967.main.css