Merge branch 'Subdivisions-of-Tutoria-Change-1' into butt

Conflicts:
kissmygrits.txt