add gambeiros
app conf
Merge branch 'master' of https://github.com/toff63/kathaton.git
Merge branch 'master' of https://github.com/toff63/kathaton