resolving merge conflicts. I didn't intentionally change anything in the README file...

diff --cc lamp-touch.lua
index 58e6058ad36ba4a8de393d2a300e7f4603680c17,d56a9cd62545e73b8f66379e25d40813a5c82773..db8ece3b0d9fd41799e83b2d2b7d4fe3dcad7150
--- 1/lamp-touch.lua
--- 2/lamp-touch.lua
+++ b/lamp-touch.lua
@@@ -134,11 -131,8 +132,9 @@@ local function ontouch(
    -- if bit.isset(down,4) then end
  
    -- draw if we've claimed it!
 +  print("ahhhh", ledfb, touchfb)
    if ledfb == touchfb then
      touchtmr:unregister()
-     print("XXXXX looking for XXXXX")
-     print(touchfnix)
      loaddrawfn(touchfns[touchfnix])(touchtmr,touchfb,touchcolorvec(touchcolor)); dodraw()
      touchtmr:start()
    end