Added time constraints
Merge branch 'master' into to_string

Conflicts:
	connectfour/src/GLaDOS.java
	connectfour/src/GLaDiOS.java