commit
Merge branch 'master' of https://github.com/mossowski/JEE

Conflicts:
	README.md