Initial commit
Merge branch 'master' of https://github.com/murdoaird/ProjectSeven
tidying up merge from github