Merge pull request #7 from gopikamohanv/master

Added option for assign model exam questions in publisher app. And added...
Design changes in student profile
Added slide show in index page
deleted conflicted copy
Corrected static file path
Merge pull request #8 from sureshvtt/master

Added slide show in index page
Design changes in student profile
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Design changes in index page
Completed option for adding questions in modelexam
completed option for assign questions in modelexam
Created one word questions for students
included autoescape in html page
Option for upload model exam questions and answer file
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/admin/admin.pyc
	pscexams/tutor/views.pyc
Option for upload model exam questions and answer file
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/__init__.pyc
	pscexams/admin/__init__.pyc
	pscexams/admin/admin.pyc
	pscexams/admin/models.py
	pscexams/admin/models.pyc
	pscexams/settings.pyc
	pscexams/static/__init__.pyc
	pscexams/static/admin.pyc
	pscexams/static/models.pyc
	pscexams/student/__init__.pyc
	pscexams/student/admin.pyc
	pscexams/student/models.pyc
	pscexams/tutor/__init__.pyc
	pscexams/tutor/admin.pyc
	pscexams/tutor/models.pyc
	pscexams/tutor/views.py
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
	pscexams/wsgi.pyc