Merge branch 'Alex' into Jackson-
Merge branch 'Alex' into Jackson-
:)
confilcts

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

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