Merged two versions of the Github guidelines