teaching commits
Merge branch 'master' of github.com:anthonykulis/ece536