remove merge conflict
Merge branch 'master' into email-pdf

Conflicts:
	app/pdfs/inspection_pdf.rb
stuff to send pdf
work with nil address
send pdf email
Merge pull request #19 from thogg4/email-pdf

Email pdf