Merge branch 'master' of https://git.heroku.com/polar-lake-2234
Merge branch 'master' of https://github.com/MichaelPaulukonis/huffingboingboing
getting from other pages; only there are some (encoding?) issues....