Added calculateField() function for local_client
Merge branch 'master' of https://github.com/taureliloome/tron

Conflicts:
	World.h