ignore pngs
…
...
Merge branch 'master' of https://github.com/gormed/drunken-nemesis

Conflicts:
	.gitignore
	opus/OpusProject/nbproject/build-impl.xml
	opus/OpusProject/nbproject/project.properties
	opus/OpusProject/nbproject/project.xml