Add temporary~ files to .gitignore
Merge branch 'gh-pages' of github.com:tomer/MozillaIsrael-www into gh-pages