form validation
Merge branch 'master' of github.com:Poplava/yams