igore and web.xml file  local
Merge branch 'master' of
ssh://git@github.com/javaguy0726/watashi-no-code.git

Conflicts:
	Html5Demo/WebRoot/WEB-INF/web.xml
chapter last