Progress
Merge branch 'master' of https://github.com/scuellar/COS424

Conflicts:
	classify.py
	justTry.py