langweiliger commit
Merge branch 'master' of https://github.com/AnneHartebrodt/ProjetJava

Conflicts:
	main/Main.class
	main/Main.java
Voilaaa!