Edit readme
Merge branch 'master' of https://github.com/iBurana/git-harjoitus

Conflicts:
	README.md