made a clear distinction between arduino-style stuff and classic low level c stuff
oops deleted a bit too much
Merge remote-tracking branch 'upstream/master'

Conflicts:
	makefile
	src/Arduino/Arduino.cpp