merge
Merge branch 'thesis-text-merge'

Conflicts:
	config.pyc
	flask/app/ScriptGen.py