changes
Merge branch 'master' of https://github.com/cnd11/ECE1160

MERge
Merge branch 'master' of https://github.com/cnd11/ECE1160

merge
notes string