added methods to gameInfo and trade controllers
Merge branch 'master' of https://github.com/abe-austin/Catan

Conflicts:
	java/src/controller/ControllerFacade.java