commit for pull

Conflicts:
	.gitignore
	Gemfile.lock
	app/models/vote.rb
	db/schema.rb
carrierwave v1.0
Edit for test pass
Made Eric's recommended changes
Merge branch 'frontend' of github.com:LaunchAcademy/south_park_reviews into frontend
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
initial commit
merged with master
Added Admin functionality
Broke up testing suite
More test coverage
Even more tests
Got carrier wave to work, tested image uploading
Got carrier wave to work, tested image uploading
Merge branch 'admin_rights' of github.com:LaunchAcademy/south_park_reviews into admin_rights