Merge branch 'master' of https://github.com/Kkristjan/test

Conflicts:
	shopping.txt