more self from laptop
Merge branch 'master' of http://github.com/TannerBaldus/codecheck

Conflicts:
	Grader.py