Emil's changes
Merge branch 'master' of git@github.com:EmilMaric/EmilEddy.git

Conflicts:
	README.md