deletes properly
Merge branch 'master' of github.com:tarasiegel/tarasiegel_cis196