fpo images
Merge branch 'master' of https://github.com/12sm/deupy

Conflicts:
	index.html