35- 36
Merge remote-tracking branch 'origin/master'

Conflicts:
	stage07-artist2/s1level35.py