Fixed formatting that I forgot to fix over the weekend
Merge branch 'master' of https://github.com/imbrium998/CS180

Conflicts:
	Assignment7/bin/Pizza.class
	Assignment7/bin/PizzaOrder.class
	Assignment7/src/Pizza.java