First Commit. Calculator.java is the entry point.
Merge branch 'master' of github.com:rohit33/Hello
Second commit
Conflicts:
	.gitignore