testing commit
 Merge branch 'master' of github.com:marcb70/ideasofmarch

Conflicts:
	main/bin/resources.ap_
.
.