Added silly 2 with different text under jobs branch
Committing jons  branch
Merge branch 'jonsWorkingBranch' (fixed)

Conflicts:
	silly.txt
Merge branch 'master' into jonsWorkingBranch
Merge branch 'jonsWorkingBranch'