Änderung lokal
Merge branch 'master' of https://github.com/aerkefiende/testproject

Conflicts:
	main.cpp