_
_
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
Merge branch 'master' of https://github.com/CodeKlerk/HCMPv2

Conflicts:
	.gitignore fic
1255
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2