Merge branch 'js-testing'
Comments Form
Merge branch 'master' of https://github.com/dswright/ruby2

Conflicts:
	app/controllers/stocks_controller.rb
	app/views/stocks/show.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
	test/models/stock_test.rb
removed non-functioning graph
updated js file
updated asset pipeline
changed require tree
changed config
testing js
updated production.rb config
precompiled assets
updated configs
static assets true
updated compiler
updated productino gems
Fixed comment form
removed pre compile files
comments controller
Merge Stock Comment Changes
Fixed stock form again after failed merge