Updated the media files setup
Updated the media files setup
Merge branch 'master' of github.com:leifos/tango_with_django

Conflicts:
	.DS_Store
Merge branch 'master' of github.com:leifos/tango_with_django