add mating info
optimize image
Merge branch 'master' of github.com:nikcorg/parrot

Conflicts:
	index.html