i hate merges
Merge branch 'master' of https://github.com/aaronwsmith12/mobileApp

Conflicts:
	pizza_calculator.html