merge pull
Merge branch 'hardwareppl' of https://github.com/FelixTheCat29/Group19Project2 into hardwareppl

Conflicts:
	Java Files/ChefApp/bin/ChefApp.apk
	Java Files/OrderApp/bin/OrderApp.apk
	Java Files/OrderApp/bin/resources.ap_
ViewOrder finalized