Merge branch 'master' of C:\Users\Russell\Documents\GitHub\Collaboration with conflicts.