Merge branch 'master' of https://github.com/jelofsson/Portfolio-app

Conflicts:
PortfolioApp/src/com/example/portfolioapp/Carl.java