Fuck github, and fuck merge conflicts
Fuck github, and fuck merge conflicts

Frontend
roxanne-baker/game-authoring-environment,roxanne-baker/game-authoring-environment,roxanne-baker/game-authoring-environment