Added Portals, Spikes, Respawn Points, Credits, HeroManager
Merge branch 'master' of https://github.com/Matt343/jolly-polarity-game into David

Conflicts:
	Assets/Levels/level1.unity
	Assets/Levels/titlescreen.unity
	Assets/Prefabs/Box.prefab
	Assets/Prefabs/Hero.prefab
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset
Merge branch 'master' into David

Conflicts:
	Assets/Levels/level1.unity
	Assets/Levels/level2.unity
	Assets/Levels/level2.unity.meta
	Assets/Prefabs/Hero.prefab
Fixed hero prefab after merge