Forced conflict ;)
Merge branch 'master' of https://github.com/fjcb/AWE

Conflicts:
	Aufgabe1/main.rb