Gui changes
Merge branch 'master' of https://github.com/gfink/project2CSCE315v2