merge
Merge branch 'master' of https://github.com/fmunoz88/fmunoz

Conflicts:
	js/jquery.scrollto.js