links + published
Merge branch 'master' of https://github.com/Fiquem/Team-17.git