Backup code
Merge branch 'master' of https://github.com/CERVIN/moving-nav

Conflicts:
	js/carousel.js