test
synch problems
Merge branch 'master' of https://github.com/ftrias/fiatino

Conflicts:
	Teensy/firmware/firmware.ino.bak