add partial package
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
pull all, and merge package.json file.
I added serveral lines of code in app.js in order to make it runnable.

And some other files of my part which is still in development.