more tweaks
Merge branch 'master' of github.com:dannydavidson/react-kick-the-tires

Conflicts:
	app/index.html