Merge branch 'Alex' into Jackson-
testing skview
Merge remote-tracking branch 'origin/Jackson-' into Jackson-
Merge branch 'Alex' into Jackson-
Delete

Conflicts:
	Biofarm/Biofarm/Base.lproj/Main.storyboard
	Biofarm/Biofarm/GameViewController.swift
Delete 2
Horray
Merge branch 'Jackson-' into Alex