merging
Merge branch 'master' of github.com:hkust-psan1/FYP
debugging light
Merge pull request #7 from guanlun/master

debugging light