test
test
test
more changes
Merge branch 'Master' into Alex

Conflicts:
	.gitignore

Biofarm/Biofarm.xcodeproj/project.xcworkspace/xcuserdata/tagger94.xcuser
datad/UserInterfaceState.xcuserstate