Edited GUI
Merge branch 'master' of https://github.com/tmccall8829/ENGR-131-Final-Project