Nothing to commit
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/settings.pyc