Changed variable names
Merge branch 'master' of https://github.com/sivaramambikasaran/BBFMM2D

Conflicts:
	.DS_Store
	src/.DS_Store
Merge branch 'master' of https://github.com/sivaramambikasaran/BBFMM2D