Merge branch 'player'
dummy collision method and initial BBs
Merge branch 'master' of https://github.com/cloudarts/twoapart
Merge branch 'player'
Merge branch 'master' into player
first animations of player