kennitala
Merge branch 'master' of github.com:grebnafets/kennitolu-athugun

Conflicts:
	README.md