d
Merge branch 'master' of https://github.com/Pilzy/Math316

Conflicts:
	Sources/main.h