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