Pulling everything, but want to keep my drv_gps.c

For some reason, I can compile from your master with my drv_gps.c on local machine, but I cannot compile from my fork.

Lets do a pull and if it overwrites the drv_gps.c I can re-upload