Final Version
Merge branch 'master' of github.com:ex172000/NS-Data-Collection-System