first commit for tut2
Merge branch 'master' of https://github.com/thuraucsy/shopping
2nd summit
Merge branch 'master' of https://github.com/thuraucsy/shopping

Conflicts:
	sample.txt