Merge branch 'master' into Z+R
SchoolMenu

upgrade to school menu to help fix bug to show panel
Merge pull request #3 from zackevans/Z+R

Z+r