try again with 2 lines
make README markdown
Merge branch 'master' of github.com:leo-clubs/marozi
rename setup.sh
Merge branch 'master' of github.com:leifg/marozi
correct reference to setup script
Merge pull request #17 from leifg/master

generic stuff