Updated Makefile to merge jar files
Merge pull request #2 from joedrago/master

Updated Makefile to merge jar files