Testing conflicting commit (2).
Merge branch 'master' of https://github.com/MichiLazarus/Hotelreservierung

Conflicts:
	README.md