...
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/UserInterface.java
...
asdf
Merge remote-tracking branch 'cmbennett/master'
...
Wahoo
...
...
...
Merge remote-tracking branch 'tdm0429/master'
RocketPadsGame JUnit Test
User encoding in SQL Database
Cleaning up
...
Merge remote-tracking branch 'cmbennett/master'
fix classpath (war/WEB-INF/classes should be output dir)