stuff.txt improved for real
Merge branch 'master' of https://github.com/lornajane/demo-repo into one-improvement
gitignore added
Merge branch 'master' of https://github.com/lornajane/demo-repo into one-improvement
merge conflicts resolved
Merge branch 'master' of github.com:lornajane/demo-repo
Merge branch 'one-improvement' of github.com:klemenp/demo-repo into klemenp-one-improvement

Conflicts:
	.gitignore
Merge branch 'klemenp-one-improvement'
Merge branch 'master' of github.com:lornajane/demo-repo