Changed database name in settings.py but problem with csrf
Merge branch 'master' of https://github.com/harshitha1990/ManiProject

Conflicts:
	maniproject/maniproject/settings.py