Merge remote-tracking branch 'origin/aaron-general-fixes'
Merge branch 'master' of github.com:natebeck/manfred
Game Template progress
Streamer Dashboard mostly stubbed out
Merge pull request #5 from natebeck/JNB-HTMLUpdates

Jnb html updates