WARNING: VERY DANGEROUS FUNCTION ADDED, DO NOT RUN IT
Merge branch 'master' of github.com:lornajane/demo-repo
removed dangerous stuff
new file added, tiny little feature
Merge remote-tracking branch 'sebastjanm/sebo' into sebastjanm
cool new feature is coming
don't need the extra file
Merge remote-tracking branch 'klemenp/one-improvement'
Merge branch 'master' of https://github.com/lornajane/demo-repo into one-improvement
gitignore added