Change 1
Change 2
My first commit on feature
One more commit
Another Change
Yet Another Change
Change
Change
Change
Revert "Change"

This reverts commit 853a48f964f0a1f7d9cac05a1f8c93ab08201c04.

Conflicts:
	jasm-feature1.txt
Merge branch 'jasm-feature1' of https://github.com/jansmout/hellogitworld into jasm-feature1

Conflicts:
	jasm-feature1.txt