Added mcmod.info file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/mcmod.info