trying to get touch events working
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/plan.html