Merge conflict resolved baby!
Updated .gitignore