sup
Merge branch 'master' of https://github.com/talbenari1/Blueprint

Conflicts:
	model/mongoose.js