Merge branch 'Jackson-' into Alex
Buttons Mayhem
Merge branch 'Alex' into Jackson-
New Project
Merge branch 'Alex' into Jackson-
Delete

Conflicts:
	Biofarm/Biofarm/Base.lproj/Main.storyboard
	Biofarm/Biofarm/GameViewController.swift
Delete 2