new line in a file
nursery rhymes
Merge branch 'awkward' fixes #11123

Conflicts:
	stuff.txt
Create README.md
Update README.md
WARNING: VERY DANGEROUS FUNCTION ADDED, DO NOT RUN IT
Merge branch 'master' of github.com:lornajane/demo-repo
Add a question
added new stuff
removed dangerous stuff
stuff.txt improved
minorbranch stage
new file added, tiny little feature
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