Inicio do BOF
Merge branch 'master' of github.com:psenna/HMAX_C

Conflicts:
	HMAX_Senna.pro.user
	HMax_Class/c2th.cpp