# Conflicts:
#	package-lock.json
#	src/components/super-spawner.js
#	src/hub.js
#	src/react-components/2d-hud.js