final
Merge branch 'master' of https://github.com/xiangz/MyYoutube_project

Conflicts:
	MyYoutube_project/settings.py
	MyYoutube_project/settings.pyc
	myYoutube.db
	myYoutube/models.pyc
	myYoutube/views.py
	myYoutube/views.pyc