My changes
Merge branch 'master' of https://github.com/kmcintyre/mailvelo

Conflicts:
	index.html