Merge remote-tracking branch 'github/master'
Added *~ to .gitignore to ignore emacs backup files.
Merge branch 'master' of github.com:wtetzner/exploding-fish