updated linkinfo
Merge branch 'master' of github.com:devvis/anna

Conflicts.