Moved the data members to the beginning of the SimpleSemaphore class to be consistent with the other classes in other assignments.
Merge remote-tracking branch 'upstream/master'