..
Merge branch 'master' of git://github.com/MStrandh/gray_scott_reaction_diffusion

Conflicts:
	gray_scott_reaction_diffusion.pde