Calcualte
Merge branch 'master' of https://github.com/fmcp/proyectoWP8