MERGE
Merge branch 'master' of https://github.com/MasterPie/MHCI_Hackathon
INTEGRATION_PART_ONE
Merge branch 'master' of https://github.com/MasterPie/MHCI_Hackathon