Styles, markup
Merge branch 'master' of https://github.com/jtirrell1/Mobile-Food-Ordering
Added some data stuff, minor junk
Merge branch 'master' of https://github.com/jtirrell1/Mobile-Food-Ordering

Conflicts:
	app/views/cart.html
	app/views/checkout.html
	app/views/confirm.html
	app/views/location.html
	app/views/location.html~