Merge "Improve gitignore for project"