ugly GUI added
Merge branch 'master' of https://github.com/robz/CS354R-Project3