modified .gitignore
Merge branch 'develop'

* develop:
  modified .gitignore

Conflicts:
	.gitignore