Adds favicon for play
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	public/queue.html