Merge branch 'rf24' of http://gogs.embe-it.de:7001/marvin/arduino-c into rf24

compile

@@ -1,12 +1,21 @@
 #!/bin/bash
 
 mkdir build
+
+avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/rf24.o -Wall rf24/rf24.c
+
 avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/util.o -Wall ard/util.c
 avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/serial.o -Wall ard/serial.c
 avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/pins.o -Wall ard/pins.c
+<<<<<<< HEAD
 avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/rf24.o -Wall rf24/rf24.c
+=======
+
+>>>>>>> d37ce320cdf8a301e18381e3496229ff2103e1cb
 avr-gcc -Os -DF_CPU=16000000UL -mmcu=atmega328p -c -o build/main.o -Wall main.c
+
 avr-gcc -mmcu=atmega328p build/*.o -o build/main
 avr-objcopy -O ihex -R .eeprom build/main build/main.hex
 avrdude -F -V -c arduino -p ATMEGA328P -P $1 -b 57600 -U flash:w:build/main.hex
+
 rm -r build

main.c

@@ -18,7 +18,6 @@ int main(){
 }
 
 void prepare(){
-	// enable global interrupts and serial port
 	pins_init();
 	serial_init(9600);