Merge branch 'master', remote branch 'origin'
Merge branch 'master' of https://github.com/mannybatista/todo
Made changes to todo_controller, todo.js, add_view.js and todo_layout_view.js