Added Ctor to Room for map creation
Added code to the shuffleMap method
ISsues with git
Issues with git
Merge origin/master

Conflicts:
	GameDesign/src/gamedesign/Room.java