Merge branch 'master' of github.com:axitkhurana/Softwares

Conflicts:
	.gitignore
	imgds/constants.py
	imgds/static/css/app.css
	imgds/urls.py
	imgds/views.py
	templates/index.html
	templates/results.html
add settings.py to .gitignore