merged with aaron
Added more game graphics/functionality
More UI Changes
home page changes
Merge remote-tracking branch 'aroth4/master'

Conflicts:
	HeatGem/src/edu/ycp/cs320/heatgem/client/HomePage.java
classpath
there should be no bin directory
Merge branch 'master' of git@github.com:nlay/HeatGem.git