changes to be overwritten by merge
Merge branch 'master' of https://github.com/FinalsClub/AnnotoriousClient-Server
adding annotator touch