tabs working
manual merge
Merge branch 'master' of https://github.com/VincentLou/HCI_Project
added tabs