Updating scene and player prefab
Trying to figure out SSH
Testing ssh
Testing ssh more
Merge branch 'dev' into playerControls

Conflicts:
	Assets/Prefabs/PlayerInformation.prefab
	Assets/Scenes/MPG Scenes/02_00P.unity
Looking at playerControls
Test
Made minimally playable game. Im continuing to be the strongest member of the team.
Minor Stuff
Worked on colliders and jumping
Start screen and other scenes
Merge branch 'playerControls' into dev

Conflicts:
	Assets/Scenes/MPG Scenes/00_00StartScene.unity
Updating Branch
Merge branch 'dev' of https://github.com/Hehfay/Space-Adventure into dev

Conflicts:
	Assets/Scenes/MPG Scenes/00_00StartScene.unity
	ProjectSettings/EditorBuildSettings.asset
Hopefully fixing prior issues
Revert "Made minimally playable game. Im continuing to be the strongest member of the team."

This reverts commit f8b0d7d36780c5d6b596679c287a8d7ac5e7bd68.

Conflicts:
	Assets/Scenes/MPG Scenes/00_00StartScene.unity
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'hehfay_dev' into dev
Merge branch 'TJSceneDev' into dev

Conflicts:
	Assets/Prefabs/PlayerInformation.prefab
	Assets/Scenes/MPG Scenes/00_00StartScene.unity
	Assets/Scripts/danny/DT_DemoDoor.cs
pasted 00_00StartScene.unity from TJSceneDev to dev
pasted PlayerInformation.prefab from TJSceneDev into dev