Merge branch 'master' of https://github.com/lornajane/demo-repo into excellent-feature
stuff renamed
Merge branch 'file_renamed' of github.com:klemenp/demo-repo into klemenp-file_renamed
Merge branch 'klemenp-file_renamed'