the beginning of a great feature
Added one even more cool feature!
added some dangerous stuff again
what a fine update
Merge branch 'master' into super-update
can you get a joke?
A small commit on two files.
added changes
Merge branch 'master' of github.com:lornajane/demo-repo
Merge branch 'master' of github.com:lornajane/demo-repo into excellent-feature
Merge branch 'master' into super-update

Conflicts:
	stuff.txt
Merge branch 'master' of github.com:lornajane/demo-repo
Merge remote-tracking branch 'uros/more-cool-features' into uros-great-feature
Merge branch 'master' of https://github.com/lornajane/demo-repo into excellent-feature
Merge branch 'damijanm-super-update'

Conflicts:
	stuff.txt
Merge branch 'master' of github.com:lornajane/demo-repo
stuff renamed
Merge pull request #1 from lornajane/excellent-feature

the beginning of a great feature
Merge pull request #9 from damijanm/super-update

what a fine update
Merge pull request #8 from lovrenca/danger

Danger