finished version 1
Merge branch 'master' of https://github.com/jjman505/socialmint

Conflicts:
	client/views/stock/show.js