initial flask
Merge branch 'master'

Conflicts:
	Test Code Thesis.py
merge
merge