playerStats directive
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/views/index.html