Merge branch 'Evaluations' into Michael-Swedo
Player Information
Merge remote-tracking branch 'origin/master' into Robert-Rojas
Small fixes.
Work on dialog implementation.
Merge remote-tracking branch 'origin/Robert-Rojas' into Michael-Swedo

Conflicts:
	ProjectSettings/Physics2DSettings.asset
Tests with Robert's Inventory.
Work on Dialog, camera pan, new art implemented.

Don’t try to walk through transition triggers in the hallway or things
will breaaaak
Merge branch 'Michael-Swedo' into Evaluations
Merge branch 'Evaluations'