Modification of shuffleMap method:
added roomType
Merge origin/master
Added shuffleMap method to GUI class