update
Merge branch 'master' of https://github.com/delcmo/Conference_Physio

Conflicts:
	Physio_conference.pdf
	physor2014.bst
	physor2014.sty
	plots/Pressure.png
	plots/Temperature.png
	plots/Velocity.png
	plots/Viscosity.png