commit b4 pull
Merge branch 'master' of github.com:vijay-shanker/ZingyHome

Conflicts:
	ZingyHome/urls.py
	ZingyHome/views.py