Cleanup Commit
Merge branch 'master' of https://github.com/nickponvert/bioinformatics

Fix branch merge issues