Week 2

Merging