Reformat time stamp
Merge branch 'Step_1' into Step_2
Merge branch 'Step_2' into Step_3
Merge branch 'Step_3' into Step_4

Conflicts:
	app/views/players/index.html.erb
Reformat time stamps
Merge branch 'Step_4' into Step_5
Merge branch 'Step_5' into Step_6