update project for heroku and S3
Merge branch 'master' of https://github.com/Tartuffe1/django-deploy-heroku-s3

Conflicts:
	django15/settings.py