ember cli setup app
Merge branch 'master' of https://github.com/marcodemoja/mappyfied

Conflicts:
	.gitignore
	README.md