first commit
Merge branch 'master' of https://github.com/Bidzina/kunka

Conflicts:
	asa.php