initial commit
initial commit
Merge branch 'master' of https://github.com/martinjrobins/Aboria

Conflicts:
	examples/CPB/sphdem.cpp~
	examples/dem/dem.h