gkukj
Merge branch 'master' of https://github.com/AlexLeSang/ECOHT-ANN_2

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/AlexLeSang/ECOHT-ANN_2

Conflicts:
	main.cpp