Datenbank 1
Datenbank 1
Db
db
Merge branch 'master' of https://github.com/wuggenid/Diplomarbeit

Conflicts:
	pizza/app/controllers/BestellungenController.php
	pizza/app/views/bestellung.blade.php
	pizza/app/views/layout.blade.php