Merge pull request #15 from guanlun/master

added missing files
Merge pull request #16 from guanlun/master

timer added
Merge branch 'master' of github.com:hkust-psan1/FYP