Base scene preparation
Merge commit 'HEAD@{1}'

Conflicts:
	dist/bundle.js
	src/scripts/index.js
can we please ignore this?