People\_init_.py
add polls app
Merge branch 'master' of https://github.com/mcarlucc/iFriends

Conflicts:
	settings.py