SalaryReport work and document
Merge branch 'master' of https://github.com/jasoncarty/SalaryApp

Conflicts:
	app/assets/javascripts/salary_report.js.coffee
	app/controllers/salary_report_controller.rb
	app/views/salary_report/_form.html.erb