started on type 5
good merge
Merge branch 'master' of https://github.com/endopol/cs429-hw7
type five done
type 5
added type 5
Merge branch 'master' of https://github.com/endopol/cs429-hw7