Merge branch 'master' of https://github.com/mochaware/HelloAspAngular.git
Revert "fix todo list version confliction control"

This reverts commit 437edddd2b3de617fa18487e16a397643e2a3135.
Merge branch 'master' of https://github.com/mochaware/HelloAspAngular.git