ok
Merge branch 'master' of https://github.com/brunocicom/POSA-14

Conflicts:
	assignments/assignment0/src/SimpleAtomicLong.java