don't know what is this
Merge branch 'master' of https://github.com/ameidar/ScaryBugs

Conflicts:

ScaryBugs.xcodeproj/project.xcworkspace/xcuserdata/ameidar.xcuserdatad/U
serInterfaceState.xcuserstate
na
na

na