wip
Merge branch 'master' of https://github.com/macropodhq/gitr-client
card update
Merge branch 'master' of https://github.com/macropodhq/gitr-client