Merge branch 'master' of https://github.com/UWPCE-PythonCert/training.python_web

Conflicts:
	resources/session04/wsgi/bookapp.py
Merge branch 'master' of https://github.com/UWPCE-PythonCert/training.python_web

Conflicts:
	resources/session04/wsgi/bookapp.py
commit