Update from Shane
Merge branch 'master' into Shane

Conflicts:
	src/Shop.java
	src/StockTest.java
ShopNoGUI added Users,Login and Main Menu for both Admin and User.
Merge branch 'master' of https://github.com/fcpteam1/project