update project with Makefile and .travis.yml (not working yet)
fix merge
update project with Makefile and .travis.yml (not working yet)
fix merge
update Makefile
repleace Makefile with ant file
Merge pull request #8 from pointhi/master

using build.xml instead of Makefile