Changed Setup and added methods to Game
Merge branch 'master' of https://github.com/parkrbrown/ConnectFour

Conflicts:
	Setup.java