stuff
Merge branch 'jacob' of https://github.com/eina0163/Test into jacob

Conflicts:
	shoppinglist.txt.orig