Made changest to changeState(), removed duplicate 'machine[theMachine]'
calls and pulled them into a local variable called "currentMachine".
Also extracted the logic for 'taking a job off the queue and work on it'
into its own method in the machine class. Added "getCurrentTime()" a
getter for 'timeNow' field.
More changes to 'changeState()' removed dublicate calls to .activejob
saving it to the 'lastJob' local variable. Added getActiveJob() method
to machine class and relpaced .activejob calls with it.
Changed variable 't' in changeState to 'jobTime' added comment about
what the variable is. Forgot to mention the Addition of
'clearActiveJob()' method in machine class during the last commit.
clearActiveJob() sets the activeJob to null.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/applications/MachineShopSimulator.java
Fixed conflicts with the head and local versions.