Added all Sparkfun libs via script
fixed merge conflicts