doctor update
Merge branch 'master' of https://github.com/kent-ma/ece356

Conflicts:
	web/index.jsp
Merge branch 'master' of https://github.com/kent-ma/ece356
fix doctor
Merge branch 'master' of https://github.com/kent-ma/ece356