commit master
Merge branch 'master' of https://github.com/laitkor/Online-Pizza-Order-App

Conflicts:
	abc.php