First commit
Merge branch 'master' of https://github.com/berniesamson/first-ember-project

Conflicts:
	README.md