stuff
Merge branch 'master' of github.com:synic/arduino

Conflicts:
	simon/ino.ini