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
Merge pull request #9 from gopikamohanv/master

Option for upload model exam question and answers
Option for adding tips and tricks in tutor app.
Model for TipsandTricks are also included
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Merge pull request #10 from gopikamohanv/master

Option for adding tips and tricks in tutor app.  Model for TipsandTricks are also included
Modified tipsandtricks model and template
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Merge pull request #11 from gopikamohanv/master

Modified tipsandtricks model and template
Read&Learn and Trips&Tricks options were included in student account.
Option to find user details in admin part.
option to view user details in admin part.
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/__init__.pyc
	pscexams/admin/__init__.pyc
	pscexams/admin/admin.pyc
	pscexams/admin/models.pyc
	pscexams/admin/templates/admin_header.html
	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.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
	pscexams/wsgi.pyc