resume pretraining
Merge branch 'master' of github.com:troylee/kaldi
update for mering
Merge atlas branch 'master' of github.com:troylee/kaldi

Conflicts:
	egs/aurora4/a00/00_01_tmp.sh