merged with aaron
home page changes
Merge remote-tracking branch 'aroth4/master'

Conflicts:
	HeatGem/src/edu/ycp/cs320/heatgem/client/HomePage.java
created classes that will be used for database
Merge remote-tracking branch 'tbibb/master'
classpath
there should be no bin directory
test class
Merge branch 'master' of git@github.com:nlay/HeatGem.git
unfinished merge?
Merge remote-tracking branch 'tbibb/master'
remove superfluous entry
Merge remote-tracking branch 'kpike1Fetch/master'
Merge remote-tracking branch 'kpike1/master'
new classes in server
unfinished merge?
idk
added unnecessary bin directory to .gitignore
im 12 and what is this
updates