allow user to enter input values
Merge branch 'master' of git://github.com/daveho/Calculator2

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