Calculator app
Merge branch 'master' of https://github.com/jonathanbello/Tealeaf_Material

Conflicts:
	calculatorapp.rb