nm
Merge branch 'master' of http://github.com/gedim21/quadcopter
Merge branch 'master' of http://github.com/gedim21/quadcopter

Conflicts:
	arduino/quad/quad.ino