obj manager
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014 into features/player
added collison_test to objectmanager for player/projectiles/enemies
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014 into features/player
merge
merge conflict
merge conflict