ignore
fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	.gitignore
	application/config/database.php