working on my portion
damn merges

Merge branch 'master' of https://github.com/jdawes/seng426project