added collison_test to objectmanager for player/projectiles/enemies
Cleaned up Index File
fixed enemy
merge
merge conflict