merge in new contributing file from develop