merged
Merge branch 'master' of github.com:ianmiell/shutit
Merge branch 'master' of github.com:ianmiell/shutit
show output
Merge branch 'master' of github.com:ianmiell/shutit