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

Conflicts:
	atrem/src/atrem/Connect4/Game/GameController.java