First build
new images
Merge branch 'master' of github.com:zturnbow/Sencha13Hackathon

Conflicts:
	app.html