Merge pull request #1 from dreenabiswas/dr1

Dr1
Merge pull request #2 from dreenabiswas/dr1

add the .idea files
.idea files creating trouble
Merge branch 'master' of https://github.com/dreenabiswas/webstorm-test1

Conflicts:
	.idea/workspace.xml
branch maddy pushes
branch maddy pushes 2
branch maddy pushes 2
maddy commits
Merge pull request #3 from dreenabiswas/maddy

Maddy
maddy trial1
Merge branch 'master' into dr1

Conflicts:
	.idea/workspace.xml
	membersname.txt