refactored
Merge branch 'master' of https://github.com/cprasenj/ADDA

Conflicts:
	app.js
Merge branch 'master' of https://github.com/cprasenj/ADDA

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/cprasenj/ADDA
users object is deleted from db.json
Merge branch 'master' of https://github.com/cprasenj/ADDA

Conflicts:
	app.js
	data/addaDB.json