Merging the code between stocks.coffee and stock.coffee and removing stocks.coffee
Merge pull request #1334 from johnwyles/stocks.coffee-and-stock.coffee-merge

Merging the code between stocks.coffee and stock.coffee and removing stocks.coffee