Merge branch 'master' of https://github.com/munii/StuyRule-MSLA

Conflicts:
	Shriekster.java