changed and if to and else if
Merge branch 'master' of github.com:cshinaver/tron