Basic classes
Basic classes
Basic classes
Basic classes
Basic classes
Basic classes
Basic classes
Adding avg & stdDev
Merge origin/master

Conflicts:
	individual.h
	nbproject/configurations.xml
Merge origin/master

Conflicts:
	individual.h
	nbproject/configurations.xml