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

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
	BioFarm_NEW/BioFarm/BioFarm/Crop.swift
Merge branch 'Master2' into Alex

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