simple linear regression works; run 'rake generate_slr_script' to test
Merge branch 'master' of https://github.com/jcburke14/dugong

Conflicts:
	app/controllers/data_sets_controller.rb
	app/views/data_sets/new.html.erb