added javadoc commenting to gps functions and timer functions
hopefully fixed dumb merge issue