git ignored userdb
Merge branch 'master' of https://github.com/roopakpatil123/doccapp

Conflicts:
	.gitignore
Upload Quiz enhancements, Prof Nav Template
merge

Conflicts:
	mysite/mysite/urls.py