added display inventory
Merge branch 'master' of https://github.com/btcarl/cst205

Conflicts:
	game.py
	game.pybak
	game.pylog

Signed-off-by: btcarl <bcarlston@csumb.edu>