hello
Merge branch 'master' of github.com:jbouchet/industrialisationGCJB

Conflicts:
	build.gradle
properties JB