Calculator.java, calculator_fragment.xml, calculator_view.xml
Added Values Folders
dime_string_file
conflicted commit
conflict resolving 1
Merge branch 'digvesh_calc'
Merge https://github.com/chris-erasmus-agilemobiledev/AgileMobileDev.GitTraining