new day started 19-12-2014
Merge branch 'master' of https://github.com/cprasenj/ADDA
solving conflict of routs/index.js

Conflicts:
	routes/index.js
Search topic operation functionality has been put and tested
production data data/addDB.json has been modified

Conflicts:
	data/addaDB.json
deleted index.js, backup.json, modified db.json, addaDB.json

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