merged oder was?
Merge branch 'master' of github.com:kobstaden/snapshotjs