Merge branch 'master' of github.com:thingles/thingelstad.com