broken merge of thesis with text builder
generates unrelated content every time locally
add importance part
impact section
small change
-
Merge branch 'thesis-text-merge'

Conflicts:
	flask/app/TestCodeThesis.py
style updates
Merge branch 'thesis-text-merge' of https://github.com/Heather-Zhang/AITED into thesis-text-merge

Conflicts:
	flask/app/ScriptGen.py
-
resolve confilcts
merge
Merge branch 'thesis-text-merge'

Conflicts:
	config.pyc
	flask/app/ScriptGen.py
modified script part
idea...
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
old thesis
old thesis
fixed used_url