update to readme
Merge branch 'master' of https://github.com/amahoney/amahoney.github.io

Conflicts:
	README.md
portfolio.html add and updates