files to be ignored removed
Gitignore added
Merge branch 'develop'

Conflicts:
	.gitignore