added salt
Merge branch 'footer'

Conflicts:
	index.html