Add rule for branch naming in contributing.md file.
Remove trailing whitespace in the contributing.md file.
Merge pull request #60 from BlaineSch/feature/branching

Feature/branching