Frogger setup
Merge branch 'master' of github.com:una/blackout-bunny

Conflicts:
	src/configs/config.js