oi
Merge branch 'master' of https://github.com/minillinim/BamTyper

Conflicts:
	bamtyper/utilities.py
Merge branch 'master' of https://github.com/minillinim/BamTyper
Merge branch 'master' of https://github.com/minillinim/BamTyper
Merge branch 'master' of https://github.com/minillinim/BamTyper
Merge branch 'master' of https://github.com/minillinim/BamTyper
Merge branch 'master' of https://github.com/minillinim/BamTyper
Merge branch 'master' of https://github.com/minillinim/BamTyper
djhkdsjhf
Merge branch 'master' of https://github.com/minillinim/BamTyper
syncing
Merge branch 'master' of github.com:minillinim/BamTyper

Conflicts:
	bamtyper/utilities.py