making players page
modifiying player page
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/style.css
	public/js/main.js