first comment
add 2 text
Merge branch 'feature/test-02' into feature/test-01

Conflicts:
	README.md
merge
Merge pull request #2 from dizzarg/feature/test-01

Feature/test 01