xyz
Conflicts:
	Struts2_Hello_world/.settings/.jsdtscope
Merge branch 'master' of https://github.com/sanjay1patel/DemoRepo
casd