Updated cli
Slowly fixing things.. I'll get it to build
It builds
It's alive
Merge pull request #4 from Robdel12/update/cli-1.1

Update/cli 1.1
Merge branch 'master' of https://github.com/Robdel12/blog into feature/add-dynamic-timeline

Conflicts:
	ember/dist/index.html