lesson learned: never try to rewrite public history...
Merge pull request #3 from theguestbook/staging

Merge dev with upstream staging