Going on to part 3

Continues to part 3 of the tutorial, right?
Merge branch 'master' of https://github.com/rall0r/Django-Tutorial

Conflicts:
	mysite/settings.pyc
	mysite/urls.pyc