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
Merge branch 'Alex' into Jackson-
Merge branch 'Jackson-' of https://github.com/tagger94/C6-Biofarm-Swift into Jackson-