fixed merge conflicts

README

lib/corn-httpclient-1.0.12.jar

nbproject/project.properties

...com/t_oster/liblasercut/FloatPowerSpeedFocusProperty.java

src/com/t_oster/liblasercut/LaserCutter.java

src/com/t_oster/liblasercut/LibInfo.java

src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java

src/com/t_oster/liblasercut/drivers/LaosCutter.java

src/com/t_oster/liblasercut/drivers/MakeBlockXYPlotter.java

...oster/liblasercut/drivers/MakeBlockXYPlotterProperty.java

src/com/t_oster/liblasercut/drivers/Marlin.java

src/com/t_oster/liblasercut/drivers/SmoothieBoard.java