Ho aggiunto pugno e clava
Merge branch 'master' of https://github.com/Nockess/nockess-dev
Merge branch 'master' of https://github.com/Nockess/nockess-dev

Conflicts:
	func.h