init integration test
.DS store
done with this phase
t
Merge branch 'exercise_4' into exercise_5

Merging exercise_4 into 5
done with this exercise