added touch
Merge branch 'master' of https://github.com/FinalsClub/AnnotoriousClient-Server

Conflicts:
	coffee/marginviewer.coffee