fancybox fix
Merge branch 'master' of https://github.com/Omarcito/js.la

Conflicts:
	public/_layout.jade