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

Conflicts:
	pscexams/admin/models.pyc
	pscexams/settings.pyc
	pscexams/student/models.pyc
	pscexams/user_type.pyc
Created options for fre contents and practice tests