.travis.yml
Merge branch 'master' of github.com:infinityxxx/django-thumbnail-maker