initial setup for minimax
Merge branch 'master' of github.com:Jegp/ISP2014

Conflicts:
	connectfour/src/GLaDOS.java
Merge branch 'master' of github.com:Jegp/ISP2014

Conflicts:
	connectfour/src/GLaDOS.java