white space changes only
Merge branch 'master' into start-reset

Conflicts:
	src/atmel.c
	src/atmel.h
	src/commands.c
Merge branch 'start-reset' into implementuser

Conflicts:
	src/atmel.c
grammar error in README
second try with the Makefile
wspc
Merge branch 'master' into start-reset
small move to minimize diff
Merge branch 'start-reset' into implementuser
bugfix leftover from merge
add debug info
add debug to intel_hex, comment on documentation

add documentation and error check to flash-user - specifically the
warning that the bootloader uses data in the user page, which gets
erased when you flash to it.  so you need to supply a valid config
word and use the --force-config flag.
add debug info and general cleanup

in flash-user allow hex file to put data in program buffer, but
raise error afterwards because error message can be more specific
change noreset to use bool instead of char
Merge branch 'start-reset' into implementuser
use t/f instead of 1/0 for dfu_bool_t forceconfig
Merge branch 'implementuser' into add_debug

Conflicts:
	src/arguments.h
	src/atmel.c
	src/atmel.h
	src/commands.c
update debug info to minimize unnecessary diff

minimize diff with implementuser
Merge branch 'add_debug' into oldupdate
nothing significant