change
Merge branch 'master' of http://github.com/shunsukesaito/DFA

Conflicts:
	DiscreteFaceAnimation/geneFace.cpp