binary
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scenes/Game.unity
fixed mapgen related warnings
Merge pull request #110 from duiker2/master

Fixed mapgen related warnings