database completed
Merge branch 'master' of https://github.com/utkbansal/roll-the-poll

Conflicts:
	app/models.py
Merge branch 'master' of https://github.com/utkbansal/roll-the-poll