Add a question
added new stuff
minorbranch stage
Merge branch 'master' of github.com:lornajane/demo-repo
Added my new feature
stuff.txt improved for real
Merge remote-tracking branch 'klemenp/one-improvement' into klemenp
Merge branch 'master' of https://github.com/lornajane/demo-repo into one-improvement
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.
gitignore added
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
adds kuku
Merge branch 'janieblue-new_stuff'
Added one even more cool feature!
Added new feature in folder
Some missing text gor added.