edited readme
added mandrill to gemfile
Merge pull request #1 from rugbycub/update_gemfile

added mandrill to gemfile
Merge branch 'master' of github.com:lalanikki/habit-app
Merge pull request #2 from lalanikki/new_readme

edited readme
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