Merge branch 'Master2' into Alex
Merge branch 'Jackson-' into Alex

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
Updated Crop and Land
Crop Info Created
Merge branch 'Alex' into Jackson-
Merge remote-tracking branch 'origin/Master2' into Alex

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
Merge branch 'Alex' into Jackson-
Fixed Crop
:)
Merge branch 'Alex' into Master2
confilcts

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
more conflicts
Fixed Errors
Merge branch 'Jackson-' into Master2

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
	BioFarm_NEW/BioFarm/BioFarm/Crop.swift