Kujundus. Abi leht.
Merge branch 'master' of https://github.com/Logish/TahanE-valida.git

Conflicts:
	war/js/script.js