clean up
Merge branch 'master' of https://github.com/UnknownHero/emberjs_sandbox

Conflicts:
	index.html
	js/application.js
	js/controllers/todos_controller.js
	js/router.js
	templates/all.hbs