Added e
Merge branch 'experiment'
Added more
Resolved the conflict
Merge branch 'experiment', want the same thing in both.
Added solution to exercise