implemented some stuff
Merge remote-tracking branch 'hove/master'

Conflicts:
	Pizza/src/edu/ycp/cs320/pizza/client/PizzaApp.java
	Pizza/src/edu/ycp/cs320/pizza/client/PizzaView.java