cont todo
Merge branch 'master' of https://github.com/hungpham/angularjs-todo-app

Conflicts:
	sources/js/todo.js
	sources/todo.html