pulling
Merge

Conflicts:
Velo Gioielli/index.html
Merge branch 'master' of https://github.com/chancetagg/team_velo