change from branch three
edit index file

edit index file
test change from branch three
commit from branchFive
commit from branchSix
Edit from vidyaBranch
Edit from master branch rebase
real edit from rebaseBranch2
Change to check rebase in master
Changes from master
A new file added in master
newly added file from master
New fila added from master branch
Commit from master branch
Commit from test pahse
test commit
Merge branch 'testProjectPhase1' of https://github.com/cirakas/Qwerty into testProjectPhase1

Conflicts:
	web/index.jsp