some mongo.py edits
Merge branch 'master' of github.com:sophgersh/Login

Conflicts:
	mongo.pyc
Merge branch 'master' of github.com:sophgersh/Login