Assignment 2 done
Merge branch 'master' of https://github.com/rullopat/POSA-14

Conflicts:

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

grading-drivers/week-2-assignment-1/src/edu/vuum/mocca/SimpleAtomicLong.
java