initial commit
Merge branch 'master' of github.com:lindsayleeds/test-paperclip
second commit