tmp
Merge branch 'gsl_mpi' of github.com:microo8/micronn into gsl_mpi

Conflicts:
	micronn.c
	nntest.c