Added getChoices and setChoices
Merge branch 'master' of https://github.com/kennyray/adventure

Conflicts:
	room.php