PART B
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/calendar.cpython-34.pyc