git commit help added
Merge branch 'Chris'
Merge branch 'Trevor'
Merge remote-tracking branch 'origin/master' into Trevor