-- created new branch
-- initial changes to the Makefile & contiki-conf