fixed stuff
Merge branch 'master' of https://github.com/VincentLou/HCI_Project