I don't know what this does
Merge branch 'gh-pages' of https://github.com/JeffreyWest/OfficeShinobi into gh-pages

Conflicts:

nodecellar/node_modules/express/node_modules/connect/node_modules/compre
ssion/node_modules/bytes/package.json

nodecellar/node_modules/express/node_modules/connect/node_modules/expres
s-session/node_modules/uid2/package.json
	nodecellar/node_modules/mongodb/node_modules/bson/build/Makefile
	nodecellar/node_modules/mongodb/node_modules/bson/build/bson.target.mk
	nodecellar/node_modules/mongodb/node_modules/bson/build/config.gypi
	nodecellar/node_modules/mongodb/node_modules/bson/builderror.log
	nodecellar/node_modules/mongodb/node_modules/kerberos/build/Makefile
	nodecellar/node_modules/mongodb/node_modules/kerberos/build/config.gypi

nodecellar/node_modules/mongodb/node_modules/kerberos/build/kerberos.tar
get.mk
	nodecellar/node_modules/mongodb/node_modules/kerberos/builderror.log
	nodecellar/package.json