Update build.xml
updated ant file to deploy executable project into tomcat dir
Merge remote-tracking branch 'origin/master'

Conflicts:
	ant/build.xml
fixed unit tests. forgot they needed to be compiled too :)
added git home env value to bat file. git uses it to locate prop file
Testing commit with benign blank line

In my local copy of BasicServiceTest.java, I added a blank line after
"package iit.csp595.service;" for testing purposes.  Using the online
tool, however, I had added the blank line after the "import static
org.junit.Assert.*;".  I want to see what overwrites what.
Merge branch 'master' of https://github.com/jimmurnane/csp-595