message
Merge branch 'master' of github.com:majoely/dragon

commiting now
Merge branch 'master' of github.com:majoely/dragon

Conflicts:
	PDC dragon game/nbproject/genfiles.properties