Fixed previous week's "problems" with the Gold class and overloading *
Merge branch 'master' of github.com:1002434/Team-1----cplusplus-
Merge branch 'master' of github.com:1002434/Team-1----cplusplus-
Added potion command.
Added potions and command for them.

Conflicts:
	adventuregame/CommandFactory.cpp