something
Merge branch 'master' of github.com:jondavidford/portfolio
Merge branch 'master' of github.com:jondavidford/portfolio
trying to show more portfolio data
merge conflict handled