Added line to gitignore to avoid uploading paperclip images used locally
Merge branch 'master' of https://github.com/jantequera/cookieshq_test