Set up for testing take 2.
Merge branch 'master' of https://github.com/jessietea/openclothes

Commit

Conflicts:
	node_modules/bcrypt/node_modules/bindings/package.json
	node_modules/bcrypt/package.json