while True loop
Merge remote-tracking branch 'origin/master'

Conflicts:
	ex34.py