this sort of works.
 add
commit team15
mergeMerge branch 'master' of https://github.com/nnja/hackettes