zacatek gui
Merge branch 'master' of https://github.com/Fjerka/IWoP

Conflicts:
	IWoP2/src/data/Main.java