Changes

Adds guidelines on how to merge to CONTRIBUTING.md
Adds a section to the CONTRIBUTING.md file explaining how to merge the
changes from a temporary branch to the mainline (develop branch).
Made by everyone.