conflicts removed
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0

Conflicts:
	Test_WebApp/WebContent/index.jsp
	Test_WebApp/WebContent/welcome.jsp
onkar's changes and jai's changes
Changes in index.jsp
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
final changes
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
new change to index.jsp
updating...
Made Changes on index.jsp to test conflict
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Removed Onkar's statement!
testing updation
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Change Title
conflicts...
Merging web.xml
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0