fixing merge conflict
Merge branch 'gestures' of https://github.com/SeanTater/gesturestitch