Merge branch 'master' of github.com:lornajane/demo-repo
Added my new feature
Merge remote-tracking branch 'klemenp/one-improvement' into klemenp
The one change has been changed to two changes ;)
Merge branch 'klemenp'
Merge pull request #4 from SamoB25/samo-feature

Feature - Samo -- lets try merging from webpage.
Merge branch 'master' of https://github.com/lornajane/demo-repo into one-improvement
Merge branch 'master' of github.com:lornajane/demo-repo
merge conflicts resolved