cli changes
Merge branch 'master' of github.com:robobario/aquatic-hand

Conflicts:
	actions.py
	world.py
commiting to pull
move query to game
move query to game
query game
Merge branch 'master' of github.com:robobario/aquatic-hand

Conflicts:
	arena.py
	character.py
Merge branch 'master' of github.com:robobario/aquatic-hand

Conflicts:
	CLIcontroller.py
	actions.py
	arena.py
	character.py
	world.py