added another print statement "hi"
Merge branch 'master' of git://github.com/dho7/Calculator

Conflicts:
	Calculator/src/edu/ycp/cs320/calculator/Main.java