branch commit
Only thing that doesn't work is merge animation
Cleaned up a bit, included instructions.