Tewarwadaw
Merge branch 'dev' of git@github.com:Originalutter/PizzaShop.git into
dev

Conflicts:
	PizzaShop/WebContent/WEB-INF/classes/pizza/PizzaServlet.class