initial
Merge branch 'master' of github.com:LucasVidal/barlafarmacia into master2