ds
Merge branch 'master' of github.com:julywater/nuclear_burning

Conflicts:
	integral.cpp
ds
add