added gui
Merge branch 'master' of https://github.com/tiffanym/APCSHW-P6