Added git ignore to prevent WS conflicts
Merge remote-tracking branch 'upstream/master'
Adding WebStorm GIT strategy, and README for GitHub
Merge pull request #1 from bobjones/master

Added git ignore to prevent WS conflicts