Vergessener Commit von gestern
Merge branch 'master' of https://github.com/moritz93/Happy-Car

Conflicts:
	SQL/trigger1.sql