ember edited
Merge branch 'master' of https://github.com/singachea/dummy-test-test

Conflicts:
	README.md