Merge branch 'master' of https://github.com/backlogAddict/QuadArduinoTrial

Conflicts:
	QuadArduinoTrial.ino