Slight change

Changed naming to help avoid confusion
Merge branch 'master' of https://github.com/VigilanteInc/BioMass

Conflicts:
	BioMass.zip