Updated Makefile to merge jar files

wat