-
Merge branch 'master' of https://github.com/Heather-Zhang/AITED

Conflicts:
	TestCodeThesis.pyc
	version1.py