added my name
conflict
merged
Merge branch 'master' of github.com:ecasilla/TodoApp