WARNING: VERY DANGEROUS FUNCTION ADDED, DO NOT RUN IT
Merge branch 'master' of github.com:lornajane/demo-repo
added new stuff
removed dangerous stuff
stuff.txt improved
Merge branch 'master' of github.com:lornajane/demo-repo
Merge remote-tracking branch 'sebastjanm/sebo' into sebastjanm
cool new feature is coming
don't need the extra file
Added my new feature
Merge remote-tracking branch 'klemenp/one-improvement'
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 github.com:lornajane/demo-repo
Merge branch 'janieblue-new_stuff'
Merge remote-tracking branch 'upstream/master' into sebo