Added Gitignore

Ignore the .idea folder for WebStorm
GitIgnore

Ignore .idea folder from Webstorm
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml