Fixed smileys pb
~
Conflicts:
	.directory