awkward
Merge branch 'master' of https://github.com/rkreiter/javaProject4

Conflicts:
	bin/.gitignore