saved
Merge branch 'master' of https://github.com/GideonUng/CadaverAnimatum

Conflicts:
	Cadaver Animatum/Cadaver Animatum-csharp.sln
	Cadaver Animatum/Cadaver Animatum.sln
saved