-
Merge branch 'master' of https://github.com/Heather-Zhang/AITED

Conflicts:
	flask/app/talk.txt