Remove pjax container
Remove Player calculations
Remove Player calculations
Merge branch 'Step_2' into Step_3