Development merge

Changed load enemy method so that it loads all enemies. Changed GetCollision method so that it loads the tileset without having to hardcode the name. Cleaned up and commented the level file. Also added small fix in the physics of player.