LR-10: Added test for PickUpCommand
Minor superficial tweaks.
Added DescribeCommand
Touch up of describe.py.
Space now requires description parameter
Added many methods to Player
Updated test.py
added unequip tests
Update test.py
Merge branch 'chris-branch' into master-merge-with-chris

Conflicts:
	game.py
	player.py
	test.py