Merge pull request #3 from UnknownHero/todo

Todo
Merge pull request #4 from UnknownHero/todo

adding-child-routes
Merge branch 'master' of https://github.com/UnknownHero/emberjs_sandbox into todo