reset
update
Merge branch 'development' of https://github.com/teekaykern/csc150-group3-final into development
add new gui