file location
Merge branch 'master' of https://github.com/offDaCharts/arduCopterSketches

Conflicts:
	ardupilot-ArduCopter-3.1.2/ArduCopter/commands_logic.ino