Improved naming consistency.
Improved naming consistency.
Merge branch 'master' of https://github.com/jbucaran/Calculator

Conflicts:
	README.md
Fixed README file.