classpath
there should be no bin directory
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'
new classes in server
unfinished merge?
idk