main method
Merge branch 'develp'

Conflicts:
	src/main/java/Iwa.java