See if this merges okay

This will change your Tricopter.c file to my newly updated one. It might need changing if you are doing all the methods in other files, but just see if it works and email me back/text me.