Merge branch 'master' into JD
Added collisions with enemies
Merge branch 'JD'

Added the enemy collsion