Change rmagick line in gemfile to eliminate error
Add rails_12factor gem for deploying to heroku
cleaned up gemfile
addressed merge conflict in gemfile
changed variable name
Merge branch 'ajaxify_votes' of github.com:zhbanton/photo_mixer into ajaxify_votes

Conflicts:
	Gemfile