Merge branch 'master' of https://github.com/connyz/emmac

Conflicts:
	README.md
hgfhgfhf