good formatting
no message
Merge branch 'Trevor' into Anthony

Conflicts:
	index.html
fixed an error -STEPPING AWAY FOR  A MIN