updated ignore and project files
merged two changes into gitignore