updated .gitignore
Merge remote-tracking branch 'origin/master' into slider

Conflicts:
	.gitignore