removed error
Merge branch 'master' of https://github.com/pallavikhandekar/Peg-a-Page

Conflicts:
	PegAPage/views.py
removed error