Merge branch 'original-posa14/master'

Conflicts:
	assignments/week-2-assignment-1/src/edu/vuum/mocca/SimpleAtomicLong.java
	assignments/week-3-assignment-2/src/edu/vuum/mocca/SimpleAtomicLong.java
Merge branch 'origin/master'

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