Reverting back to Stjernegaards
Merge branch 'master' of https://github.com/stjernegard/www