Stuffs
Merge branch 'master' of https://github.com/hoihallohoi/PAF2

Conflicts:
	src/userInterface/main.java