changes to thesis and views
Merge branch 'thesis-text-merge' of https://github.com/Heather-Zhang/AITED into thesis-text-merge

Conflicts:
	flask/app/ScriptGen.py
	flask/app/views.py