good by
Merge branch 'master' of https://github.com/zonedHobbits/andPortfolio

Conflicts:
	PHP/zhPortfolioAPI.php
	src/com/example/zonedhobbitsportfolio/MainActivity.java