Attempt 2 at branching

:(
Merge pull request #2 from SShariat/zachs_branch_of_a_branch

Attempt 2 at branching