Update README.rdoc
Update README.rdoc
Update and rename README.rdoc to README.md
Merge pull request #3 from jamesjenkinsyates/master

James Jenkins-Yates added to Readme.
Added James and changed to markdown readme
Changed to Readme.md and formatted correctly
Merge pull request #4 from jamesjenkinsyates/master

Changed Readme.rdoc to markdown and added James.
Added paperclip to gemfile
Implemented user ability to add avatar
HAML and Offer Partial
Merge pull request #5 from jamesjenkinsyates/master

HAML and Offer Partial
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)
Facebook buttons and further testing
Concluding merge
added impressions per offer in viewport
haml conflict resolved