some changes to show merging
some changes to show merging2
merged
added maybatis
added servlet
added jsp