Merge "Updated .gitignore to work with ide"