slight edits, ignore
Merge branch 'master' of https://github.com/katekinsman/JAK

Conflicts:
	teachertemplate.php