index changes
Merge branch 'master' of https://github.com/archana1790/giftme

Conflicts:
	src/main/webapp/index.jsp
Changes committed
Merge branch 'master' of https://github.com/archana1790/giftme

Conflicts:
	src/main/webapp/index.jsp
commit
Merge branch 'master' of https://github.com/archana1790/giftme

Conflicts:
	src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/archana1790/giftme

Conflicts:
	src/main/webapp/index.jsp