commit 1
commit one
commit two
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/examples/EgittestServlet.java