1
2
3
Merge branch '1.0.1'

Conflicts:
	src/main/java/Test/App.java