Options Screen
Merge branch 'master' of github.com:Lduperron/CSCI375-Team-Project