guidelines day 2
Merge branch 'master' of github.com:lewagon/promo-4-challenges
what?