Merge branch 'master' into gh-pages
Delete test.png
delete

i deleted jimmy pics of wrong size
add

added correct size jimmy
Merge branch 'gh-pages'

Conflicts:
	img/Eiffel1.jpg
	img/Eiffel2.jpg
	img/Eiffel3.jpg
	img/Eiffel4.jpg
	img/Eiffel5.jpg
	img/Eiffel6.jpg