Wait for active status, not network
Merge remote-tracking branch 'origin/master'

Conflicts:
	challenge1.py
updated for more stuff