View all Orders
Merge branch 'master' of https://github.com/projectteam5/Project1
Merge branch 'master' of https://github.com/projectteam5/Project1

Conflicts:
	orders.txt
Merge branch 'master' of https://github.com/projectteam5/Project1