second commit
Merge branch 'master' of https://github.com/jcastro3/todo-angularfire