Testing "Hello Wolrd!!" change
test
test
Merge remote-tracking branch 'origin/Jackson-' into Jackson-
test
help
why
test
end of terror
messing around with stuff
Merge remote-tracking branch 'origin/Jackson-' into Jackson-
Merge branch 'Alex' into Jackson-

Conflicts:
	.gitignore

Biofarm/Biofarm.xcodeproj/project.xcworkspace/xcuserdata/tagger94.xcuser
datad/UserInterfaceState.xcuserstate
update ignore
Merge branch 'Jackson-' into Master

Conflicts:

Biofarm/Biofarm.xcodeproj/project.xcworkspace/xcshareddata/Biofarm.xcche
ckout

Biofarm/Biofarm.xcodeproj/project.xcworkspace/xcuserdata/tagger94.xcuser
datad/UserInterfaceState.xcuserstate
	Biofarm/Biofarm/GameScene.swift
Merge branch 'Master' into Alex