Added more to define menu
Merge branch 'master' of https://github.com/AshtonO/TonysPizza.git

Conflicts:
	CS414A5/src/system/SystemManager.java
Merge branch 'master' of https://github.com/AshtonO/TonysPizza.git

Conflicts:
	CS414A5/src/UI/mainFrame.java