update media etc
Merge branch 'master' of github.com:wgroeneveld/blog