updating from lab5
Merge branch 'master' of https://github.com/KHarland/DNA