Changed drink
Merge branch 'master' of https://github.com/bigskytech/ember-todo

Conflicts:
	app/locales/en.js