fix
Merge branch 'master' of https://github.com/Jegp/ISP2014

Conflicts:
	connectfour/src/GLaDOS.java