Initial commit
initial commit

Added new comment
Merge branch 'master' of git://github.com/dho7/YCPCS320JJDA
no comment
No Comment
Merge branch 'master' of git://github.com/daveho/Calculator
added another print statement "hi"
Added new comment
Merge branch 'master' of git://github.com/dho7/Calculator

Conflicts:
	Calculator/src/edu/ycp/cs320/calculator/Main.java
get rid of spurious .project file
Merge remote-tracking branch 'jheltze3/master'