Merge branch 'master' of github.com:lalanikki/habit-app
generated habits controller
Merge branch 'habit-controller' of github.com:perez-e/habit-app into perez-e-habit-controller
Merge branch 'master' of github.com:lalanikki/habit-app