Merge pull request #430 from joshsamuelson/windows_classroom

Windows classroom
Merge pull request #431 from joshsamuelson/windows_classroom

using the userprefs notepad