init
Merge branch 'master' of https://github.com/johanpoirier/wallblog-ember

Conflicts:
	README.md