allow user to enter input values
Added line to show data input

A line will print out the numbers the user entered for validation.
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/Main.java
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/Main.java
	Calculator2/src/edu/ycp/cs320/calculator/RocketPadsLocation.java
...
Merge remote-tracking branch 'colin/master'
Merge remote-tracking branch 'cmbennett/master'
Nothing again
JUnit test copy and pasted from cmbennett
...
...
Merge remote-tracking branch 'colin/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsPlayer.java
	UserInterface/.classpath
... new
Merge remote-tracking branch 'colin/master'

Conflicts:
	UserInterface/.classpath