Merge branch 'develop' of https://github.com/mbret/node_todolist into develop
Merge branch 'master' into develop