My branch
Added GPS location stuff