resolve merge conflict
-rw-r--r-- 114 .gitignore
drwxr-xr-x - ArduinoLDR
-rw-r--r-- 35147 COPYING
-rw-r--r-- 15752 INSTALL
-rw-r--r-- 23 Makefile.am
-rw-r--r-- 1385 configure.ac
-rw-r--r-- 22 depends
drwxr-xr-x - doc
drwxr-xr-x - hardware
drwxr-xr-x - src
drwxr-xr-x - test
drwxr-xr-x - web