reset master branch
Merge branch 'master' of https://github.com/felixmz/BiochipBox

Conflicts:
	Makefile
	at91sam7x_biobox_v0.2_flash.bin
	at91sam7x_biobox_v0.2_flash.elf

Makefile undeleted
binaries taken over from server