try to fix micah's mess
Merge branch 'master' of https://github.com/TitoAlfaro/GlassHeat

Conflicts:
	.classpath
	gen/mit/edu/obmg/glassheat/R.java