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

Conflicts:
	public/assets/application-15e48fc0526325861087b635c5233560.css.gz
	public/assets/application-25a524ec642ab594ff8512c3380f2511.js.gz
	public/assets/manifest-2429014b069d86a1476c710c6e622ac6.json

public/assets/templates/salary_reports/_document_fields-ee91dfbacff523f7
967291d758e7245b.html.gz

public/assets/templates/salary_reports/index-d05577fff6e744ca8147f97aa43
67b36.html.gz

public/assets/templates/salary_reports/new-287bef3aa1e6749aeb9abb1f6d193
be7.html.gz

public/assets/templates/salary_reports/show-9a551c34f6c483225b11c3312f5d
efbc.html.gz

public/assets/templates/salary_reports/user_index-d05577fff6e744ca8147f9
7aa4367b36.html.gz

public/assets/templates/users/_form-a11c68eb0e22aa3b2b2e6f3e65c83ca2.htm
l.gz

public/assets/templates/users/index-8ce6e93961b7e205d2d4324778f582a6.htm
l.gz

public/assets/templates/users/show-c6a5a61cc21240727de49d4d558ecf1f.html
.gz