Merge branch 'master' of https://github.com/douglascraigschmidt/POSA-14
Week two solution
Week two submitted solution
Merge branch 'master' of github.com:dmulligan/POSA-14

Conflicts:
	assignments/week-2-assignment-1/src/edu/vuum/mocca/SimpleAtomicLong.java
Week three submission