message
Merge branch 'master' of https://github.com/jasoncarty/newApp

Conflicts:
	app/assets/angular/templates/salary_reports/new.html.erb