merge
Merge branch 'master' of https://github.com/kedromelon/ios_final
initial collision bitmasking implementation