update job.php
Merge branch 'master' of https://github.com/danwain/builder-job-log
merge
Merge branch 'master' of https://github.com/danwain/builder-job-log

Conflicts:
	job.php

update