Updating the migrations...
Added rails_12factor to allow for better configuration of application for heroku
Merge pull request #46 from ijustwanttocode/cd/heroku_ready

Added rails_12factor to allow for better configuration of application for heroku
Merge branch 'development' into jr/fix_migrations
You can now add friendships from the friendship index page
Added spec for the friendship controller
Moved friend and stranger lists into partials
Changed users to strangers on the friendship controller
Changed variable to be more terse
Adding code climate badge

https://codeclimate.com/github/ijustwanttocode/whyeatthings
Removing presenter 'h' method in favor of template

- Also made a few changes to improve the readability of a code section
Removed unneeded param to friend feed link
Rename suggestions
Merge pull request #35 from ijustwanttocode/jr/dashboard_part3

WIP: Dashboard part 3 - Finally hooking the parts into the view
Merging in development
Merge pull request #36 from ijustwanttocode/jr/fix_migrations

Fix migrations
Rename migration to ScaleMeasurements
Merge pull request #48 from ijustwanttocode/cd/friend_feed

Add/remove friend widget
Updated model related code
Controller rename and relationship rename