firebase set takes 2 arguments, not 3
Merge branch 'develop'