C to C++
Merge branch 'develop' of github.com:jcare44/DarIO into develop

Conflicts:
	main.c