Merge branch 'dev' of https://github.com/sthzg/django-stockartist into dev
Updated .gitignore