A bit more work
Merge branch 'master' of https://github.com/jnew528/finalYearProj