removed merge conflict from 404
Merge branch 'master' of github.com:an-hmn/portfolio_lab