Merge remote-tracking branch 'upstream/master'

Conflicts:
	app.py
	templates/classroom_info.html
	templates/index.html