Got servlets  working

title
Merge remote-tracking branch 'origin/master'

Conflicts:
	FindTheTime/war/myGroups.jsp