-
Merge branch 'thesis-text-merge'

Conflicts:
	flask/app/TestCodeThesis.py