whateve
Small change to teacher
Merge branch 'Doug-fixes'

Conflicts:
	README