title oops - see #107 #109
Merge branch 'magazine' of github.com:midnightbreakfast/web into magazine