Added new branch command
Added merge feature
Changed branch to use proper branch method
Added new checkout command
Added test for new branch and checking out a branch
Added merge test
added first part of merge test
Merge pull request #2 from Eruant/master

Add: Branch, Merge, Checkout