a
Merge branch 'master' of https://github.com/alanhuang1990/PCANET
d :
Conflicts:
	PCANet_demo/YALEB32_WhitenedPCA_50_d_Full_'_PCANET.mat
a