Customer Class changed
Merge branch 'master' into Shane

Conflicts:
	src/model/Shop.java
	
conflicts fixed