Exercise 11
Merge branch 'dev' of github.com:fbrix/zuul-withtests into dev

Conflicts:
	CommandWord.class
	CommandWord.java
	CommandWords.class
	CommandWords.java
	Game$1.class
	Game.class
	Game.java
	Room.class
	Room.java
	bluej.pkg
	package.bluej