Ignore codekit.
Ignore corregido
Merge remote-tracking branch 'origin/develop' into DD_charsheet

Conflicts:
	.gitignore