Files at the end of exercise1
Merge branch 'exercise1' into dev