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

Conflicts:
	Java Files/ChefApp/res/menu/main_page.xml
Merge branch 'hardwareppl' of https://github.com/FelixTheCat29/Group19Project2 into hardwareppl

Conflicts:
	Java Files/ChefApp/src/com/example/chefapp/MainPage.java
commit
added view order on chef side