more
Merge branch 'master' of github.com:mattcreager/smrt

Conflicts:
	public/js/teacher.js