Added some functionality to get data from the front-end
Resolved merge conflict
Merge pull request #66 from xue0chao/master

Added front-end functionality to get data from node
Remove gulpfile.js from concat task
New concat file