added correct .gitignore file
Gitignore changes
Gitignore changes
Gitignore changes
Merge branch 'develop'

Conflicts:
	.gitignore