Shane
Shane
Shane
shane
Shane
ampersand fix
right?
Merge branch 'master' into branch1

Conflicts:
	index.html