edited readme
Merge pull request #1 from rugbycub/update_gemfile

added mandrill to gemfile
Merge branch 'master' of github.com:lalanikki/habit-app
Merge branch 'new_readme' of https://github.com/lalanikki/habit-app into update_gemfile

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge commit '2e07760cebebd2c90b4704d0059ce7dd87dcad61' into update_gemfile
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 into update_gemfile
Merge branch 'master' of github.com:lalanikki/habit-app
Merge branch 'master' of github.com:lalanikki/habit-app into update_gemfile