Merge pull from steph, added contents to exercises