Experimenting with git

Updating with minor xml and .java changes