redoing some if statements
Merge branch 'master' of github.com:omgitstom/tvnexthack