Added PHPStorm Files to Gitignore.
Resolved .gitignore Merge Conflict.