Changed some of the GUI
Merge branch 'master' of https://github.com/Gwalks91/ICS163Final