Richs help methods and modifying touchesBegan
fixes merge conflict
hotfix