W1prac

Merge rest of week 1 into rheller's master