fixes #127
Merge branch 'magazine' of github.com:midnightbreakfast/web into magazine