Create Order implemented
Merged master into local branch
Added structure to finish order functionality
Getting my branch updated
Changes to stock and Customer class
Merge branch 'master' of https://github.com/fcpteam1/project
Sale GUI
Merge branch 'master' into Shane

Conflicts:
	src/model/Shop.java
	
conflicts fixed