Player prefab with Kick Up

This was in conflict for my last commit so I just updated and redid my
work on the prefab.