added back the todo comments
Merge branch 'master' of https://github.com/karoitay/POSA-14

Conflicts:
	assignments/week-1-assignment-0/src/edu/vuum/mooca/SynchronizedQueue.java