Reducing size of images
Merge branch 'master' of https://github.com/fork-ed/demo

Conflicts:
	images/kenni.jpg