working it out
Syncing
Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chemical Diffusion/src/bc/diffusion/main/DiffusionGUI.java
	Chemical Diffusion/src/bc/diffusion/main/Grids.java
	Chemical Diffusion/src/bc/diffusion/main/UPlotter.java
	Chemical Diffusion/src/bc/diffusion/main/VPlotter.java