work in progress
work in progress
rename assembly to fatjar
add maven assembly to build a ZIP archive of the project

Conflicts:
	pom.xml
bug fix
bug fix
work in progress
work in progress