d
Merge branch 'master' of https://github.com/rramsaro/froggr.git
g
Merge branch 'master' of https://github.com/rramsaro/froggr.git