add
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Generated_files.xml
	.idea/misc.xml
	.idea/workspace.xml
	Dal/dbHelper.js
	Dal/newDb.js
	controllers/home.js
	node_modules/multi-process-session/lib/index.js
	node_modules/multi-process-session/lib/redisHelper.js
	node_modules/simple-mvc/example/app.js
	node_modules/simple-mvc/example/controllers/home.js
	node_modules/simple-mvc/lib.js
	node_modules/simple-mvc/test/index.js
	package.json