Added all that stuff we talked about
Merge branch 'master' of https://github.com/HonoursDA2/DA