1-2
3-4
5-6
Merge branch 'feature/d2' into develop
Merge branch 'feature/d1' into develop

Conflicts:
	main.cpp
	main_2.cpp
	main_3.cpp