add gem heroku
made fix for heroku
update gemfile.lock
add mandrill mailer
Merge branch 'master' of heroku.com:garagecrm into featute/heroku_deployment
fix mandrill
update readme
Merge branch 'featute/heroku_deployment' into feature/account_settings
add ruby version
Merge branch 'feature/account_settings' of https://github.com/RubyGarage/GarageCRM into feature/account_settings

Conflicts:
	Gemfile