my first feature commit
some more changes
change1
change2
change message
change
Revert "change2"

This reverts commit 4d0c0d3a5773cc8d59b03726672aee0e1467265b.

Conflicts:
	krisb-feature1.txt