aummary
Merge branch 'master' of https://github.com/bjued/week1

Conflicts:
	zoneControl/.DS_Store