Merging the code between stocks.coffee and stock.coffee and removing stocks.coffee
Updating master with merge from branch stocks.coffee-and-stock.coffee-merge