Added paperclip to gemfile
Implemented user ability to add avatar
Started tests for following a business
added beginnings of follow feature
began features for functional following
functioning follow button, needs follow/unfollow
Fixing merge from MBottjer - application_controller.rb, user.rb diffed
Fixed tests from merge
Facebook and Google log on and it is tested with Cucumber
Merging all updates into master branch and fixing all tests
Merged in J Jenkins-Yates Facebook/Google login, nav bar tweaks (links/avatar)
haml conflict resolved