Slideshow and Sticky Nav
Merge branch 'master' of https://github.com/chancetagg/team_velo

Conflicts:
	Velo Gioielli/index.html