1
2
3
Merge branch '1.0.1'

Conflicts:
	src/main/java/Test/App.java
Merge branch 'master' into 1.0.0

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