ignoring local site solution
Merge branch 'master' of https://github.com/portlandcodeschool/frontend-freelancer