s
Merge branch 'master' of https://github.com/cloudnero/SQAHomework

Conflicts:
	week2/summary.rtf