Committing to merge
Merge branch 'master' of https://github.com/TedStudley/AdvectFlow

Conflicts:
	source/FlowAdvection.cpp