test
Merge branch 'master' of
https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git

Conflicts:
	atrem/src/atrem/Connect4/Game/player/PlayerController.java
	atrem/src/atrem/Connect4/console/PlayerConsole.java