test
Merge branch 'master' of github.com:Spacejoker/professor

Conflicts:
	algo.py