Update styleguide with new instructions for git merging
Merge pull request #69 from Revolutionary-Games/update_styleguide

Update styleguide with new instructions for git merging