kauppa.txt lisätty
tesi

Merge branch 'master' of https://github.com/samroos/KauppaNavi

Conflicts:
	README.md.orig
updated