added hw10
merge conflict resolved

Merge branch 'master' of github.com:jarad/stat544

Conflicts:
	homework/hw10.Rnw