My Second Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/com/ori/git/tutorial/Calculator.class
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'