Merge branch 'master' of https://github.com/sean-broomfield/SOS

Conflicts:
Job.cpp
Job.h
os.cpp
Update Job and os files. Finished DrumManager and and ioManager files. Barebones of memory files written.
Updates.

File updates of os.cpp, job, iomanager, and drum manager classes.