Merge branch 'master' of https://github.com/sampohaavisto/my-favourite-project

Conflicts:
	README.md
I added myself