UPDATE
Merge branch 'master' of https://github.com/17marijn71/OOP-Final-Project

Conflicts:
	src/connectfour/ConnectFour.java
Player&game logic (partially)
More Player stuff
Merge branch 'master' into marijn-dev

Conflicts:
	src/connectfour/model/Model.java
Fixed merge problems