debugging tally logic
Merge branch 'master' of github.com:omgitstom/tvnexthack
Merge branch 'client-side' of github.com:omgitstom/tvnexthack
getting up to date
Merge branch 'master' of github.com:omgitstom/tvnexthack
blarrrgh
Merge branch 'master' of github.com:omgitstom/tvnexthack
fixed totals
Merge branch 'master' of github.com:omgitstom/tvnexthack