update project with Makefile and .travis.yml (not working yet)
fix merge
repleace Makefile with ant file