Modified Settings
Modified .gitignore and package.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/IEEECS-VIT/GPL
Merge branch 'master' of https://github.com/IEEECS-VIT/GPL
Regenerated Code

Regenerated Code for Express 4.2 and updated scripts