merging
version casi final
arreglo en guido
Merge branch 'master' of https://github.com/longtrail/empanadapp
Merge branch 'master' of https://github.com/longtrail/empanadapp