added basic java greeter
cleanup commit
Merge branch 'master' of https://github.com/fijiaaron/greeter

Conflicts:
	express/README.md
	express/package.json