Merge branch 'master' of https://github.com/thingol/simple-email-client-for-uni

Conflicts:
	src/de/uni_jena/min/in0043/nine_mens_morris/Init.java
Merge branch 'master' of https://github.com/thingol/simple-email-client-for-uni

Conflicts:
	src/de/uni_jena/min/in0043/nine_mens_morris/Init.java