added merge
Updated Branch and Naming Conventions (markdown)
Created Branch and Naming Conventions (markdown)