Preparing collition detection
merging for collition and weapons
Merge branch 'master' of https://github.com/MadsStilling/Farting