added in conserved sequences as markers for partitioning
Merge branch 'master' of github.com:ctSkennerton/Amplishot

Conflicts:
	bin/amplishot