Merge pull request #1 from MiKE41/patch-1

Update hockey.luac
Merge branch 'no-time-mod'

* no-time-mod:
  Use pretty names, and only show actual game streams
Display test streams in a seperate "Test Streams" folder
Merge branch 'no-time-mod'

* no-time-mod:
  Display test streams in a seperate "Test Streams" folder

Conflicts:
	hockey.luac
Merge branch 'master' into pre-2.1

* master:
  Display test streams in a seperate "Test Streams" folder

Conflicts:
	hockey.luac