third commit
Merge branch 'master' of https://github.com/hamzeh77/JavaApplication1 into dev

Conflicts:
	JavaApplication1/src/javaapplication1/Pizza.java
dev branch