for merge
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	package.json
	server.js
	views/login.ejs
Merge branch 'master' of github.com:jemah/enchord