16 4
Merge branch 'master' of github.com:vassvik/SPH2D

Conflicts:
	main2.cpp