update to Gemfile
update to Gemfile
update to database.yml
precompiled assests
update to ruby version
update to database config for deployment
update to database config
removed dependancy on rmagick
update to Readme
fix merge conflict