What 2 sports were added back into the summer olympics for 2012?

Baseball and softball have been dropped from the oplympics from 2012 onwards, because no-one outside of North America plays them; but Rugby sevens and golf are being added from 2016.