test-merge-commit: modified main.cpp (added comment string)
master: modified resource.h
added definition for DINGO
master: merge branch local master with 'master' of https://github.com/uomoinginocchio/demo

Conflicts:
	resource.h