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
Merge branch 'master' of github.com:lornajane/demo-repo
Merge branch 'amajorbranch' of github.com:Hattivatti/demo-repo into Hattivatti-amajorbranch

Conflicts:
	stuff.txt
Merge branch 'Hattivatti-amajorbranch'