branch one
test commit
test
c
Merge branch 'branchone' of https://github.com/laitkor/Online-Pizza-Order-App into branchone
Merge branch 'branchone'
Merge remote-tracking branch 'remotes/origin/testbranch'

Conflicts:
	abc.php