setting up on desktop
Merge branch 'branchA' into branchB
Merge pull request #3 from dcyphert/branchB

Branch b