kk
Merge branch 'master' of
https://github.com/kvitajakub/marathonOctober2014.git

Conflicts:
	windowGUI.java