added code that doesn't allow camera to move if player is colliding with obstacle or wall. (also in order for the player to not  change from being in the center of tiles i think we need to make him the size of the tile)
Merge branch 'Maurice' of https://github.com/michael21115/MuseumThief into floorGen

Added Maurice's update to file but still need to resolve conflicts. Cameras are spawning, and facing the right way.