Merge pull request #406 from dbetebenner/master

Pull of latest commit to SchoolView branch