paperclip
resolve conflicts
Merge pull request #3 from LeDeep/paperclip

Paperclip