added superjump and duplicate powerup swap
merging powerup changes

Conflicts:
	Assets/Resources/PlayerRobot.prefab
	Assets/scenes/GameScene.unity
	Assets/scripts/PowerUp.cs
	Assets/scripts/RobotController.cs
fixing merge problems, fixing cursor
Merge branch 'master' of github.com:ForbiddenDonut99/robot_factory