Additional content
Merge branch 'master' of https://github.com/atehwa/git-koulutus

Conflicts:
	jaakkos-not-so-interesting-file
Merge branch 'master' of https://github.com/atehwa/git-koulutus