added thief from maya can you add it to prefabs
End of Class Push
Merge pull request #2 from michael21115/floorGen

End of Class Push
Merge pull request #3 from michael21115/player

added thief from maya can you add it to prefabs
Merge pull request #4 from michael21115/harry

Harry's Branch
Adjusted all the models to use in world gen by separating models and prefabs. Now models have a dedicated folder and prefabs a separate folder (keep only one prefab per tile type at any time, properly tagged ).
Adjusted Enemy spawn
Added basic texture to floor
Added bounding box spawning around the edges of the area at the end of the code.
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assets/Prefabs/Back Wall Door.prefab
	Assets/Prefabs/Back Wall Empty.prefab
	Assets/Prefabs/Back Wall Obstacle.prefab
	Assets/Prefabs/Corner Door.prefab
	Assets/Prefabs/Corner Empty.prefab
	Assets/Prefabs/Corner Obstacle.prefab
	Assets/Prefabs/Floor Tile Empty.prefab
	Assets/Prefabs/Floor Tile Obstacle.prefab
	Assets/Prefabs/Side Wall Empty.prefab
	Assets/Prefabs/Side Wall Obstacle.prefab
	Assets/Scenes/MuseumGeneration.unity
Added texture mesh to floor tiles
Merge branch 'floorGen' of https://github.com/michael21115/MuseumThief into floorGen

Conflicts:
	Assets/Prefabs/Back Wall Door.prefab
	Assets/Prefabs/Back Wall Empty.prefab
	Assets/Prefabs/Back Wall Obstacle.prefab
	Assets/Prefabs/Corner Door.prefab
	Assets/Prefabs/Corner Empty.prefab
	Assets/Prefabs/Corner Obstacle.prefab
	Assets/Prefabs/Floor Tile Empty.prefab
	Assets/Prefabs/Floor Tile Obstacle.prefab
	Assets/Prefabs/Side Wall Empty.prefab
	Assets/Prefabs/Side Wall Obstacle.prefab
	MuseumThief-csharp.sln
	MuseumThief.sln
added trigger box to the player to detect obstacles. however the trigger box only work sometimes (which is weird and i am trying to fix)
fixed code for bumping into obstacles
more player code editing
fixed player going through box collider
more player edits
changed how fast camera moves when player moves (it was going too fast and flying off the board)
got the guard to move
Merge pull request #5 from michael21115/player

Player