Added exercise 1
Merge branch 'Master2'