Added description field to Item and Room.
Added changes.
Merge branch 'master' of https://github.com/notjonmadden/uml-acm-games

Conflicts:
	game_engine/changelog.txt
	game_engine/main.cpp