Merge branch 'issues/resources-in-root-dir' of github.com:mread/buck
Merge branch 'master' of github.com:mread/buck