adding google buttons
fixing merges
merging again