added another print statement
Added a second message to the main.java file
Merge branch 'master' of git://github.com/daveho/Calculator

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