Merge branch 'master' of github.com:1002434/Team-1----cplusplus- into tanelipe

Conflicts:
	README.txt
	adventuregame/adventure.exe
	adventuregame/gamestate.txt
Cleaning up after merging with master
Added operator overloading to Gold class
Still cleaning after merge
Modified gamestate.txt
Merge branch 'tanelipe'