code challenge 06
Merge branch 'master' of https://github.com/portlandcodeschool/frontend-freelancer