add class Karin
123
123
Merge origin/master

Conflicts:
	Minimart/src/minimart/Minimart.java