Fix rotation for touch
Merge branch 'master' of github.com:calvintam/comp4920