type2
merging independent changes
Merge branch 'master' of https://github.com/endopol/cs429-hw7
merged