Adding settings gui
Merge branch 'master' of https://github.com/alexadorsey/CSCI526Project1