tabela 2/3
Merge branch 'master' of github.com:damjanm/APPR-2014-15