commit 1
commit for new class
Merge branch 'submaster'

Conflicts:
	src/com/examples/EgittestServlet.java