login/registration
Merge branch 'develop' into pavan-branch

Conflicts:
	teamproject/.idea/workspace.xml
	teamproject/insync/admin.py
	teamproject/insync/models.py
convergent
added gitignore
Merge pull request #3 from rocketu/pavan-branch

login/registration