premerge commit
Merge branch 'master' of https://github.com/nomoreclowns/cs436hw2
fixed more errors