Merge branch 'master' of git@github.com:nearbydelta/ExpectStock.git

Conflicts:
	ctrls/brain.js
	views/item.jade
Merge branch 'master' of git@github.com:nearbydelta/ExpectStock.git