init
Merge branch 'master' of https://github.com/ehinger/collective-client