user.class
Merge branch 'Benyam' of https://github.com/claunz/MavenOnlineBusiness into Benyam

Conflicts:
	target/classes/shop/entity/User.class