manual sync 13/06
Merge branch 'master' of https://github.com/brunocicom/POSA-14

Conflicts:

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