modified:   src/ANN.c
Merge branch 'master' of https://github.com/Giga-Byte/ANN

Conflicts:
	src/ANN.c

	modified:   src/ANN.c