iii
iii
iiiwqMerge branch 'layout' into design

Conflicts:
	week2/assign1.py
iii

Revert "Initial commit"

This reverts commit 1b8512800a3ab7842654368ebc86847205053feb.