pene
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/Main.class