commit for pull

Conflicts:
	.gitignore
	Gemfile.lock
	app/models/vote.rb
	db/schema.rb
carrierwave v1.0
Finished getting testing suite to work again
Made Eric's recommended changes
Updated with Eric's suggestions
reverted AvatarUploader change; test failed
Merge pull request #36 from LaunchAcademy/frontend

Frontend
Merge branch 'master' of github.com:LaunchAcademy/south_park_reviews into carrierwave-avatars

Conflicts:
	Gemfile
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/registrations/edit.html.erb
ran bundle
re-added helper function usage to user show
Merge pull request #41 from LaunchAcademy/carrierwave-avatars

Carrierwave avatars