Modified and added some GUI things
Merge branch 'master' of https://github.com/rhphung/inf122Final