#24 added touch punch for experimenting with tyto on ipad.
Merge branch 'develop'

Conflicts:
	coffeescript/tyto.coffee
	js/tyto.js