Testing
Moved timeout check inside loop
Fixed merge conflict
Minor edits to infinite time gamer