Fourth commit
Merge branch 'master' of https://github.com/NeilDoherty/Msc-AIT-Java-Fundamentals