Update the Room constructor
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	package.bluej
Merge branch 'master' of https://github.com/nsgomez/txtmagicka