Adapting code from short_job...
Merge branch 'master' of https://github.com/latinoman6/CS3060-Assignment6