modified gitignore
Merge remote branch 'origin'

Conflicts:
	.gitignore