mongodb, etc
Merge branch 'master' of https://github.com/JeffreyWest/OfficeShinobi

Conflicts:
	index.html