blah
Merge remote-tracking branch 'origin/master'
unwanted
Merge remote-tracking branch 'origin/master'
Added rotation and swiping! Needs some refining though.