Fixed merge conflict!
Merge branch 'master' of https://github.com/oh-team-machine/Target-Tapping