end of week 1
end of week 1 - after codereview
week 2
week 2 with fixes
Merge pull request #2 from mayaSun/week2

Week2