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

Conflicts:
	.idea/workspace.xml