Paperclip

Conflicts:
	Gemfile.lock