checking in (most of) q4
Merge branch 'master' of https://github.com/toOliya/Ling570_new

Conflicts:
	HW10/mike.testing