rebuild .gitignore
Added borders, background e.t.c. to index
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
Fix Github's merge
Merge branch 'gh-pages' of https://github.com/deavmi/Clippy into gh-pages

Conflicts:
	index.html