um
:)test
ignore
h
test
Removed file that should not be tracked
end of right on terror
end of terror
um terror?
help
test
test
test
test
try
Merge branch 'Alex' of https://github.com/tagger94/C6-Biofarm-Swift into Alex

Conflicts:

Biofarm/Biofarm.xcodeproj/project.xcworkspace/xcuserdata/tagger94.xcuser
datad/UserInterfaceState.xcuserstate
changes
more changes
change?
Merge branch 'Master' into Alex

Conflicts:
	.gitignore

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