readme
readme
ok
fix images
Merge branch 'master' of https://github.com/jeromeky/photobox

Conflicts:
	README.md