Fixed comment formatting
Merge branch 'master' into feature/showjobs
Initial work on displaying jobs