Calculator 1
Calc v2
Changes
Merge branch 'juan'