For abudllah
Fix shooting angle
Comment out enemy spawn tester
Update non-static to static methods in Player, update TODO's in Shooter
Try to resolve merges