pull
Merge branch 'staging'

merging changes for oauth facebook and image upload
added logging to SendToTwitter
working on heroku
Merge branch 'staging'
fixed merge
added ruby version to gemfile
added ruby version to gemfile
fixed application.css
added tweet index to character views and added testing for tweets
removed ruby specification in gemfile
got some pathing stuff done
unested some resources and fixed everything but the permissions
Create a new layout for the home landing page. Make a few changes based on the new routes.
Get ready for merge to staging.