Merge https://github.com/douglascraigschmidt/POSA-14 into posa14

Conflicts:
	assignments/week-2-assignment-1/src/edu/vuum/mocca/SimpleAtomicLong.java
	assignments/week-3-assignment-2/src/edu/vuum/mocca/SimpleAtomicLong.java
	grading-drivers/week-2-assignment-1/src/edu/vuum/mocca/SimpleAtomicLong.java
	grading-drivers/week-3-assignment-2/src/edu/vuum/mocca/SimpleAtomicLong.java