fixes

function fix
Merge branch 'master' of https://github.com/berryny/landingPageDev

Conflicts:
	index.html