update gitignore
Merge branch 'gh-pages' of https://github.com/zvg/adblock into gh-pages

Conflicts:
	.gitignore