Merge pull request #43 from kendram23/friend_model

Friend model
Add show friends to users show page
Add friend button to user show page
Hide user checkins when a friendship relationship doesn't exist
Clean up user show page
Merge remote-tracking branch 'origin/master' into friend_model