readme for q1
Merge branch 'master' of https://github.com/jerold/SE422
q2
merge resolution