gitignore
Merge branch 'front' of https://github.com/eclass/kiosko into front