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