added 4 #'s to link
fixed merge conflict
Merge branch 'master' of https://github.com/ricupero/gps1.1