error merging, fixed now
Merge branch 'master' of https://github.com/labyrwa/lab_portfolio

merge with master