Juntian Wang
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercise3.py
Juntian Wang
Merge remote-tracking branch 'origin/master'