Marlin firmware fork for MakerFarm i3v w/ auto bed level & Roxy's enhancements

[AbuMaia]

Well, I solved the hypot problem. The /* -*- c++ -*- */ at the top of marlin_main got replaced by some other text somehow. I've restored it, now I get

Marlin_main.cpp: In function ‘void retract_z_probe()’:
Marlin_main.cpp:1100:13: error: ‘axis’ was not declared in this scope
if (axis==Z_AXIS)

That would be line 1091 in the zipped file. I'm stumped this time.