added styling and menu and back button
Merge branch 'master' of https://github.com/Phillsm/CA3

Conflicts:
	views/order.jade