Moved jflex file since the generated java class was in the wrong place
Recognize some of the solids
Merge remote-tracking branch 'origin/master'