TJ's additions and modifications
Added new prefab in my scene
Merge branch 'dev' into playerControls

Conflicts:
	Assets/Scenes/TJ_TestScene.unity
Added objects to my assigned scene
Edited my scene and added pickup prefab
Merge branch 'dev' into playerControls
Merge branch 'dev' of https://github.com/Hehfay/Space-Adventure into dev

Conflicts:
	Assets/Scenes/MPG Scenes.meta