part 2
Merge branch 'master' of https://github.com/chevisc/firstDjango

Conflicts:
	ysite
fixed-conflicts