s
Merge branch 'master' of https://github.com/liginet/free

Conflicts:
	svadba-chat/svadba.js