Merged menu code and fixed stuck bug

I merged in Art's main menu code and did a bit of a hot fix for the a problem that kept coming up: the player getting stuck in collision objects. Basically it detects when it is stuck and forces itself out of the tile.

I commented out all of the additional obstacle code so that I could get a good view of the level itself without worrying about conflicting collisions.