Revert "added commit"

This reverts commit b426c0c7bb438eb9babae0e2a4ae39b67b427a66.
fix message
Merge commit '665f6b6e72c808a3b8f2ea863b4255dc42992604'

Conflicts:
	jami.txt