First commit
Merge https://github.com/hardbot/latte