Fixed a race condition.
Merge branch 'master' of http://github.com/douglascraigschmidt/POSA-14
Imported to eclilpse.
Commiting to personal week-6-assignment-5
Merge branch 'personal/working' of https://github.com/lagarciag/Coursera-POSA-14 into personal/working