just syncing
Merge branch 'master' of https://github.com/FloatingPointCollective/jrh_touchscreen

Conflicts:
	app/index.html