Merge branch 'master' of https://github.com/dizzarg/sandbox into feature/test-03
remove text
begin the 3rd feature
commit text
Merge branch 'feature/test-03' into develop
Merge branch 'develop' of https://github.com/dizzarg/sandbox into feature/test-04

Conflicts:
	README.md
Merge branch 'feature/test-04' into develop
add first java class App.java and ignore file
Merge branch 'master' of https://github.com/dizzarg/sandbox