Jeremiah White requested to merge merged into master May 10, 2016

Conflicts:

actigraphI2CMaster.c

actigraphI2CMaster.h

actigraphI2CSlave.c

actigraphTimer.c

actigraphUART.c

build/default/production/actigraphSPI.o.d

build/default/production/actigraphTimer.o.d

config.h

dist/default/production/firmware.production.elf

dist/default/production/firmware.production.hex

dist/default/production/firmware.production.map

main.c

nbproject/Makefile-Project.mk

nbproject/Makefile-genesis.properties

nbproject/Makefile-impl.mk

nbproject/Makefile-local-Project.mk

nbproject/Makefile-variables.mk

nbproject/configurations.xml

nbproject/private/SuppressibleMessageMemo.properties

nbproject/private/private.xml