add valuables to pdf
remove merge conflict
Merge branch 'master' into pdf

Conflicts:
	app/pdfs/inspection_pdf.rb
Merge pull request #16 from thogg4/pdf

valuables in pdf