working commit
Merge branch 'master' of https://github.com/JWally/mongobase

Conflicts:
	main.js