removing firebase calls from render_next, fixing bpm conflicts
Merge branch 'master' of github.com:a2lin/secret-octo-wookie