something important here
Merge branch 'master' of https://github.com/vishnuravi/invitable

Conflicts:
	.gitignore
	auth.js
Merge branch 'master' of https://github.com/vishnuravi/invitable