Add first test
Merge branch 'master' of github.com:vikewoods/paperclip-watermark