changed it again lets see
changed by me afgtyer maayank
Merge branch 'master' of https://github.com/prnv0802/StoryMakerV1.1.git

Conflicts:
	src/main/webapp/WEB-INF/views/home.jsp