Updated todo
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	views/login.ejs
For merge
Merge branch 'master' of github.com:jemah/enchord
Merge branch 'master' of github.com:jemah/enchord