del #
Merge branch 'master' of https://github.com/iamsupercp/JEasyOpc

Conflicts:
	.gitignore