Refactored challenge1 to use pyrax.utils.wait_until(), yay no more infinite loop dangers

First working version of challenge2