Testing "Hello Wolrd!!" change
test
test
Merge remote-tracking branch 'origin/Jackson-' into Jackson-
test
help
why
h
test
test
Removed file that should not be tracked
end of right on terror
end of terror
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
messing around with stuff
Merge remote-tracking branch 'origin/Jackson-' into Jackson-
changes
change?