fixing merge
Merge branch 'master' of github.com:ronde-app/ronde