lokaalista loppurivi2
Merge branch 'master' of https://github.com/mkallio/oma-appi

Conflicts:
	index.txt