Initial movie_master
Merge branch 'master' of github.com:theymc/intro-to-python-and-django

Conflicts:
	ymcproject/ymcproject/settings.py