Merge branch 'master' of https://github.com/johsh/productbiographies

Conflicts:
	prototyp/index.php
conflict fix