Final Changes-Branch merge test

Added all comments and checked code functionality. Testing ability to merge a branch