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
Newer features
Merge remote-tracking branch 'samob25/new-features' into samob25-newer-features
Merge branch 'samob25-newer-features'
Merge branch 'master' of github.com:lornajane/demo-repo
added gitignore
Merge pull request #19 from mihahribar/gitignore

Gitignore
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'