Merging Changes
CWade created a player prefab on his working branch, too, so I merged them together. The player prefab should now have everything we need for both players.