Updated .gitignore to ignore atlassian plugin file
Merged conflicts.