Created a new app currentaffairs and
models - CurrentAffair_Language, CurrentAffairs_topic, CurrentAffairs_Question, CurrentAffairs_OnewordQuestion.
Option for adding current affairs questions and read and learn part of current affairs in tutor app.
Option for adding current affairs topic in admin app.
Created a new app currentaffairs and
models - CurrentAffair_Language, CurrentAffairs_topic, CurrentAffairs_Question, CurrentAffairs_OnewordQuestion.
Option for adding current affairs questions and read and learn part of current affairs in tutor app.
Option for adding current affairs topic in admin app.

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

Conflicts:
	pscexams/admin/models.pyc
	pscexams/admin/urls.py
	pscexams/admin/views.py
	pscexams/settings.py
	pscexams/settings.pyc
	pscexams/student/models.pyc
	pscexams/student/templates/base.html
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Created a new app currentaffairs and
models - CurrentAffair_Language, CurrentAffairs_topic, CurrentAffairs_Question, CurrentAffairs_OnewordQuestion.
Option for adding current affairs questions and read and learn part of current affairs in tutor app.
Option for adding current affairs topic in admin app.
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Option for adding center in admin.
Added a new app center, and model center.
Option for center can add students.
Commit before pull
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/settings.pyc
Merge pull request #34 from sureshvtt/master

Done notifications for new questions
Merge pull request #35 from sureshvtt/master

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

Conflicts:
	pscexams/settings.pyc
Index page changes
Changes in center
Option for adding centers via admin, also login for centers
Added center app for adding students and sub centers by center
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/student/templates/base.html
	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
Merge pull request #29 from gopikamohanv/master

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

Conflicts:
	pscexams/settings.pyc
Notifications in group study
Fix bugs on notification of group study
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/student/templates/base.html