mergeli
mergeli
Merge branch 'master' of https://github.com/ilzo/MetroNavi

Conflicts:
	6_kayttoliittyma.md
Merge branch 'master' of https://github.com/ilzo/MetroNavi

Conflicts:
	6_kayttoliittyma.md

git rm .git/MERGE_HEAD