Sync
Merge branch 'master' of https://github.com/yuqirose/myPLDA

Conflicts:
	src/myPLDA.cpp
changed Phi