MERGES. whatever, classes are all getting pushed
add build.xml for testing
Merge pull request #6 from Rmarmorstein/master

additions