both controllers working
Merge branch 'master' of https://github.com/n8fern/Toy-Hell

Conflicts:
	RoboHooker/Assets/Prefabs/Robot.prefab
	RoboHooker/Assets/Scenes/whitebox.unity
	RoboHooker/ProjectSettings/InputManager.asset