mv build.xml to build2.xml and changed readme to note that. hopefully solves merge conflict