Built the base ember app using 'yo'
Merge branch 'master' of github.com:T-Nightingale/Charmander-Used-Ember

Conflicts:
	README.md
Trying to update everything