Last changes
Merge branch 'master' of https://github.com/MellorCS/comp61542-2014-lab