Add new static method calculateData() into Data class
Merge branch 'master' of ssh://git@github.com/bhop/GP.git

Conflicts:
	src/org/bhop/Data.java