changes
Merge branch 'master' of github.com:cvwang/SeqUMich3

Conflicts:
	binary_file2.h