Initial commit
Add .gitignore
Merge commit 'b8366afb869cf71ea842d6a6dade5571640dcd6d'
Fix public subtree